diff options
| author |   Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-02-27 22:35:19 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2018-02-27 22:35:19 +0100 |
| commit | 10eeab67aa6b098709b6ac0dcba5f647eab8fed3 (patch) | |
| tree | 52bcaad60f80cf3bc8b3b5c681d2db23ae76400d /test | |
| parent | po: add Japanese translation (#8289) (diff) | |
| parent | rule-syntax-check: allow commas inside quoted strings (diff) | |
| download | systemd-10eeab67aa6b098709b6ac0dcba5f647eab8fed3.tar.gz systemd-10eeab67aa6b098709b6ac0dcba5f647eab8fed3.tar.bz2 systemd-10eeab67aa6b098709b6ac0dcba5f647eab8fed3.zip | |
Merge pull request #8297 from filbranden/udevrule1
Udev rule syntax checker updates
Diffstat (limited to 'test')
| -rwxr-xr-x | test/rule-syntax-check.py | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/test/rule-syntax-check.py b/test/rule-syntax-check.py index e053b027c..7ee34eb70 100755 --- a/test/rule-syntax-check.py +++ b/test/rule-syntax-check.py @@ -28,10 +28,13 @@ rules_files = sys.argv[1:] if not rules_files: sys.exit('Specify files to test as arguments') -no_args_tests = re.compile(r'(ACTION|DEVPATH|KERNELS?|NAME|SYMLINK|SUBSYSTEMS?|DRIVERS?|TAG|RESULT|TEST)\s*(?:=|!)=\s*"([^"]*)"$') -args_tests = re.compile(r'(ATTRS?|ENV|TEST){([a-zA-Z0-9/_.*%-]+)}\s*(?:=|!)=\s*"([^"]*)"$') -no_args_assign = re.compile(r'(NAME|SYMLINK|OWNER|GROUP|MODE|TAG|PROGRAM|RUN|LABEL|GOTO|OPTIONS|IMPORT)\s*(?:\+=|:=|=)\s*"([^"]*)"$') -args_assign = re.compile(r'(ATTR|ENV|IMPORT|RUN){([a-zA-Z0-9/_.*%-]+)}\s*(=|\+=)\s*"([^"]*)"$') +quoted_string_re = r'"(?:[^\\"]|\\.)*"' +no_args_tests = re.compile(r'(ACTION|DEVPATH|KERNELS?|NAME|SYMLINK|SUBSYSTEMS?|DRIVERS?|TAG|PROGRAM|RESULT|TEST)\s*(?:=|!)=\s*' + quoted_string_re + '$') +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 = '' @@ -54,8 +57,10 @@ for path in rules_files: if not line or line.startswith('#'): continue - for clause in line.split(','): - clause = clause.strip() + # Separator ',' is normally optional but we make it mandatory here as + # it generally improves the readability of the rules. + 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)): |