summaryrefslogtreecommitdiff
path: root/test/rule-syntax-check.py
diff options
context:
space:
mode:
authorFilipe Brandenburger <filbranden@google.com>2018-02-27 13:11:07 -0800
committerFilipe Brandenburger <filbranden@google.com>2018-02-27 13:11:07 -0800
commitc9715ffce347310a5196d1375810d41fbdd01fd6 (patch)
tree0e7a7be8b63a072be5b2b2a4d0b812211ca5d235 /test/rule-syntax-check.py
parentd498347a01266fc77ad9086611495802096d00f6 (diff)
downloadsystemd-c9715ffce347310a5196d1375810d41fbdd01fd6.tar.gz
rule-syntax-check: allow commas inside quoted strings
Using a regex to match the groups is smarter than the split(',') that would break in those cases. Tested: SUBSYSTEM=="usb", ENV{ID_USB_INTERFACES}=="*:060101:*,*:070202:*", TAG+="uaccess" Rule checker doesn't break there after this commit.
Diffstat (limited to 'test/rule-syntax-check.py')
-rwxr-xr-xtest/rule-syntax-check.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/rule-syntax-check.py b/test/rule-syntax-check.py
index 1a58d17328..7ee34eb700 100755
--- a/test/rule-syntax-check.py
+++ b/test/rule-syntax-check.py
@@ -33,6 +33,8 @@ no_args_tests = re.compile(r'(ACTION|DEVPATH|KERNELS?|NAME|SYMLINK|SUBSYSTEMS?|D
args_tests = re.compile(r'(ATTRS?|ENV|TEST){([a-zA-Z0-9/_.*%-]+)}\s*(?:=|!)=\s*' + quoted_string_re + '$')
no_args_assign = re.compile(r'(NAME|SYMLINK|OWNER|GROUP|MODE|TAG|RUN|LABEL|GOTO|OPTIONS|IMPORT)\s*(?:\+=|:=|=)\s*' + quoted_string_re + '$')
args_assign = re.compile(r'(ATTR|ENV|IMPORT|RUN){([a-zA-Z0-9/_.*%-]+)}\s*(=|\+=)\s*' + quoted_string_re + '$')
+# Find comma-separated groups, but allow commas that are inside quoted strings.
+comma_separated_group_re = re.compile(r'(?:[^,"]|' + quoted_string_re + ')+')
result = 0
buffer = ''
@@ -57,8 +59,8 @@ for path in rules_files:
# Separator ',' is normally optional but we make it mandatory here as
# it generally improves the readability of the rules.
- for clause in line.split(','):
- clause = clause.strip()
+ for clause_match in comma_separated_group_re.finditer(line):
+ clause = clause_match.group().strip()
if not (no_args_tests.match(clause) or args_tests.match(clause) or
no_args_assign.match(clause) or args_assign.match(clause)):