Skip to content

Commit a0fb8af

Browse files
committed
build: sort.py: operate mostly on fixed_line
Set `fixed_line` to `line` and only use the latter when needed. This makes it easier to modify `fixed_line` multiple times.
1 parent b554b17 commit a0fb8af

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

contrib/sort.py

+11-12
Original file line numberDiff line numberDiff line change
@@ -71,18 +71,17 @@ def check_profile(filename, overwrite):
7171
was_fixed = False
7272
fixed_profile = []
7373
for lineno, line in enumerate(lines, 1):
74-
if line[:12] in ("private-bin ", "private-etc ", "private-lib "):
75-
fixed_line = f"{line[:12]}{sort_alphabetical(line[12:])}"
76-
elif line[:13] in ("seccomp.drop ", "seccomp.keep "):
77-
fixed_line = f"{line[:13]}{sort_alphabetical(line[13:])}"
78-
elif line[:10] in ("caps.drop ", "caps.keep "):
79-
fixed_line = f"{line[:10]}{sort_alphabetical(line[10:])}"
80-
elif line[:8] == "protocol":
81-
fixed_line = f"protocol {sort_protocol(line[9:])}"
82-
elif line[:8] == "seccomp ":
83-
fixed_line = f"{line[:8]}{sort_alphabetical(line[8:])}"
84-
else:
85-
fixed_line = line
74+
fixed_line = line
75+
if fixed_line[:12] in ("private-bin ", "private-etc ", "private-lib "):
76+
fixed_line = f"{fixed_line[:12]}{sort_alphabetical(fixed_line[12:])}"
77+
elif fixed_line[:13] in ("seccomp.drop ", "seccomp.keep "):
78+
fixed_line = f"{fixed_line[:13]}{sort_alphabetical(fixed_line[13:])}"
79+
elif fixed_line[:10] in ("caps.drop ", "caps.keep "):
80+
fixed_line = f"{fixed_line[:10]}{sort_alphabetical(fixed_line[10:])}"
81+
elif fixed_line[:8] == "protocol":
82+
fixed_line = f"protocol {sort_protocol(fixed_line[9:])}"
83+
elif fixed_line[:8] == "seccomp ":
84+
fixed_line = f"{fixed_line[:8]}{sort_alphabetical(fixed_line[8:])}"
8685
if fixed_line != line:
8786
was_fixed = True
8887
print(

0 commit comments

Comments
 (0)