SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rule-syntax-check: apply "ruff format" and "ruff check --fix"

Browse Source
This commit is contained in:
Yu Watanabe
2026-05-18 02:44:46 +09:00
parent ba90ffaef2
commit 2c73e5b973
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/rule-syntax-check.py
+14 -11
View File
@@ -14,21 +14,21 @@ if not rules_files:
sys.exit('Specify files to test as arguments') sys.exit('Specify files to test as arguments')
quoted_string_re = r'"(?:[^\\"]|\\.)*"' 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 + '$') no_args_tests = re.compile(rf'(ACTION|DEVPATH|KERNELS?|NAME|SYMLINK|SUBSYSTEMS?|DRIVERS?|TAG|PROGRAM|RESULT|TEST)\s*(?:=|!)=\s*{quoted_string_re}$') # fmt: skip
# PROGRAM can also be specified as an assignment. # PROGRAM can also be specified as an assignment.
program_assign = re.compile(r'PROGRAM\s*=\s*' + quoted_string_re + '$') program_assign = re.compile(r'PROGRAM\s*=\s*' + quoted_string_re + '$')
args_tests = re.compile(r'(ATTRS?|ENV|CONST|TEST){([a-zA-Z0-9/_.*%-]+)}\s*(?:=|!)=\s*' + quoted_string_re + '$') args_tests = re.compile(rf'(ATTRS?|ENV|CONST|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 + '$') no_args_assign = re.compile(rf'(NAME|SYMLINK|OWNER|GROUP|MODE|TAG|RUN|LABEL|GOTO|OPTIONS|IMPORT)\s*(?:\+=|:=|=)\s*{quoted_string_re}$') # fmt: skip
args_assign = re.compile(r'(ATTR|ENV|IMPORT|RUN){([a-zA-Z0-9/_.*%-]+)}\s*(=|\+=)\s*' + quoted_string_re + '$') args_assign = re.compile(rf'(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. # Find comma-separated groups, but allow commas that are inside quoted strings.
# Using quoted_string_re + '?' so that strings missing the last double quote # Using quoted_string_re + '?' so that strings missing the last double quote
# will still match for this part that splits on commas. # will still match for this part that splits on commas.
comma_separated_group_re = re.compile(r'(?:[^,"]|' + quoted_string_re + '?)+') comma_separated_group_re = re.compile(rf'(?:[^,"]|{quoted_string_re}?)+')
result = 0 result = 0
buffer = '' buffer = ''
for path in rules_files: for path in rules_files:
print('# looking at {}'.format(path)) print(f'# looking at {path}')
lineno = 0 lineno = 0
for line in open(path): for line in open(path):
lineno += 1 lineno += 1
@@ -50,11 +50,14 @@ for path in rules_files:
# it generally improves the readability of the rules. # it generally improves the readability of the rules.
for clause_match in comma_separated_group_re.finditer(line): for clause_match in comma_separated_group_re.finditer(line):
clause = clause_match.group().strip() clause = clause_match.group().strip()
if not (no_args_tests.match(clause) or args_tests.match(clause) or if not (
no_args_assign.match(clause) or args_assign.match(clause) or no_args_tests.match(clause)
program_assign.match(clause)): or args_tests.match(clause)
or no_args_assign.match(clause)
print('Invalid line {}:{}: {}'.format(path, lineno, line)) or args_assign.match(clause)
or program_assign.match(clause)
):
print(f'Invalid line {path}:{lineno}: {line}')
print(' clause:', clause) print(' clause:', clause)
print() print()
result = 1 result = 1