tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UBUNTU: [Packaging] annotations: Clean up policy writes

Browse Source 
The logic to determine if policy lines need to be written to the output
file is a little convoluted. Basically, if there is no 'policy' key in
a config, there is nothing to do, so put that check at the beginning of
the loop.

Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
This commit is contained in:
Juerg Haefliger
2023-02-07 08:36:04 +01:00
committed by Paolo Pisati
parent 0bd2d18b70
commit 7a79eea193
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian/scripts/misc/kconfig/annotations.py
Vendored
+19 -15
View File
@@ -276,25 +276,29 @@ class Annotation(Config):
# Only save local differences (preserve includes)
for conf in sorted(self.config):
old_val = tmp_a.config[conf] if conf in tmp_a.config else None
new_val = self.config[conf]
if 'policy' not in new_val:
continue
# If new_val is a subset of old_val, skip it
if old_val and 'policy' in old_val and 'policy' in new_val:
old_val = tmp_a.config.get(conf)
if old_val and 'policy' in old_val:
if old_val['policy'] == old_val['policy'] | new_val['policy']:
continue
if 'policy' in new_val:
val = dict(sorted(new_val['policy'].items()))
line = f"{conf : <47} policy<{val}>"
if 'note' in new_val:
val = new_val['note']
if new_val.get('oneline', False):
# Single line
line += f' note<{val}>'
else:
# Separate policy and note lines,
# followed by an empty line
line += f'\n{conf : <47} note<{val}>\n'
tmp.write(line + "\n")
# Write out the policy (and note) line(s)
val = dict(sorted(new_val['policy'].items()))
line = f"{conf : <47} policy<{val}>"
if 'note' in new_val:
val = new_val['note']
if new_val.get('oneline', False):
# Single line
line += f' note<{val}>'
else:
# Separate policy and note lines,
# followed by an empty line
line += f'\n{conf : <47} note<{val}>\n'
tmp.write(line + "\n")
# Replace annotations with the updated version
tmp.flush()