From 406b1cb18ebd463f00a437f43335d4a010b6fe05 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Tue, 26 Nov 2024 03:01:45 -0300 Subject: [PATCH] build: sort.py: rename line variables Rename `line` to `original_line` to make it less likely to accidentally read from/write to it instead of the fixed line. Rename `fixed_line` to `line` to make the code shorter since it is now referenced much more often (up to 3 times in the same line of code) than the original line. See also commit aa17ca5fc ("sort.py: rename protocols to original_protocols", 2022-10-17) / PR #5429. --- contrib/sort.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/contrib/sort.py b/contrib/sort.py index 0a316aa6e..d1ca21d79 100755 --- a/contrib/sort.py +++ b/contrib/sort.py @@ -71,25 +71,25 @@ def check_profile(filename, overwrite): lines = profile.read().split("\n") was_fixed = False fixed_profile = [] - for lineno, line in enumerate(lines, 1): - fixed_line = line - if fixed_line[:12] in ("private-bin ", "private-etc ", "private-lib "): - fixed_line = f"{fixed_line[:12]}{sort_alphabetical(fixed_line[12:])}" - elif fixed_line[:13] in ("seccomp.drop ", "seccomp.keep "): - fixed_line = f"{fixed_line[:13]}{sort_alphabetical(fixed_line[13:])}" - elif fixed_line[:10] in ("caps.drop ", "caps.keep "): - fixed_line = f"{fixed_line[:10]}{sort_alphabetical(fixed_line[10:])}" - elif fixed_line[:8] == "protocol": - fixed_line = f"protocol {sort_protocol(fixed_line[9:])}" - elif fixed_line[:8] == "seccomp ": - fixed_line = f"{fixed_line[:8]}{sort_alphabetical(fixed_line[8:])}" - if fixed_line != line: + for lineno, original_line in enumerate(lines, 1): + line = original_line + if line[:12] in ("private-bin ", "private-etc ", "private-lib "): + line = f"{line[:12]}{sort_alphabetical(line[12:])}" + elif line[:13] in ("seccomp.drop ", "seccomp.keep "): + line = f"{line[:13]}{sort_alphabetical(line[13:])}" + elif line[:10] in ("caps.drop ", "caps.keep "): + line = f"{line[:10]}{sort_alphabetical(line[10:])}" + elif line[:8] == "protocol": + line = f"protocol {sort_protocol(line[9:])}" + elif line[:8] == "seccomp ": + line = f"{line[:8]}{sort_alphabetical(line[8:])}" + if line != original_line: was_fixed = True print( - f"{filename}:{lineno}:-{line}\n" - f"{filename}:{lineno}:+{fixed_line}" + f"{filename}:{lineno}:-{original_line}\n" + f"{filename}:{lineno}:+{line}" ) - fixed_profile.append(fixed_line) + fixed_profile.append(line) if was_fixed: if overwrite: