|
 |
ff6046 |
From 1dd326b6dd0a23d1a9ee1c567962c6d5d4ef03ca Mon Sep 17 00:00:00 2001
|
|
|
ff6046 |
From: Jan Synacek <jsynacek@redhat.com>
|
|
|
ff6046 |
Date: Wed, 30 Jan 2019 12:22:41 +0100
|
|
|
ff6046 |
Subject: [PATCH] rule-syntax-check: allow PROGRAM as an assignment
|
|
|
ff6046 |
|
|
|
ff6046 |
(cherry picked from commit ed2dc503da57b0110819563e0d1c85d023435e07)
|
|
|
ff6046 |
---
|
|
|
ff6046 |
test/rule-syntax-check.py | 5 ++++-
|
|
|
ff6046 |
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
ff6046 |
|
|
|
ff6046 |
diff --git a/test/rule-syntax-check.py b/test/rule-syntax-check.py
|
|
|
ff6046 |
index 706d93632e..c7c0a1a656 100755
|
|
|
ff6046 |
--- a/test/rule-syntax-check.py
|
|
|
ff6046 |
+++ b/test/rule-syntax-check.py
|
|
|
ff6046 |
@@ -17,6 +17,8 @@ if not rules_files:
|
|
|
ff6046 |
|
|
|
ff6046 |
quoted_string_re = r'"(?:[^\\"]|\\.)*"'
|
|
|
ff6046 |
no_args_tests = re.compile(r'(ACTION|DEVPATH|KERNELS?|NAME|SYMLINK|SUBSYSTEMS?|DRIVERS?|TAG|PROGRAM|RESULT|TEST)\s*(?:=|!)=\s*' + quoted_string_re + '$')
|
|
|
ff6046 |
+# PROGRAM can also be specified as an assignment.
|
|
|
ff6046 |
+program_assign = re.compile(r'PROGRAM\s*=\s*' + quoted_string_re + '$')
|
|
|
ff6046 |
args_tests = re.compile(r'(ATTRS?|ENV|TEST){([a-zA-Z0-9/_.*%-]+)}\s*(?:=|!)=\s*' + quoted_string_re + '$')
|
|
|
ff6046 |
no_args_assign = re.compile(r'(NAME|SYMLINK|OWNER|GROUP|MODE|TAG|RUN|LABEL|GOTO|WAIT_FOR|OPTIONS|IMPORT)\s*(?:\+=|:=|=)\s*' + quoted_string_re + '$')
|
|
|
ff6046 |
args_assign = re.compile(r'(ATTR|ENV|IMPORT|RUN){([a-zA-Z0-9/_.*%-]+)}\s*(=|\+=)\s*' + quoted_string_re + '$')
|
|
|
ff6046 |
@@ -51,7 +53,8 @@ for path in rules_files:
|
|
|
ff6046 |
for clause_match in comma_separated_group_re.finditer(line):
|
|
|
ff6046 |
clause = clause_match.group().strip()
|
|
|
ff6046 |
if not (no_args_tests.match(clause) or args_tests.match(clause) or
|
|
|
ff6046 |
- no_args_assign.match(clause) or args_assign.match(clause)):
|
|
|
ff6046 |
+ no_args_assign.match(clause) or args_assign.match(clause) or
|
|
|
ff6046 |
+ program_assign.match(clause)):
|
|
|
ff6046 |
|
|
|
ff6046 |
print('Invalid line {}:{}: {}'.format(path, lineno, line))
|
|
|
ff6046 |
print(' clause:', clause)
|