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

UBUNTU: [Packaging] annotations: never drop configs that have notes different than the parent

Browse Source 
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
This commit is contained in:
Andrea Righi
2023-05-29 15:02:00 +02:00
committed by Paolo Pisati
parent b967072613
commit 4795aa23f8
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian/scripts/misc/kconfig/annotations.py
Vendored
+7 -6
View File
@@ -338,15 +338,16 @@ class Annotation(Config):
if 'policy' not in new_val:
continue
# If new_val is a subset of old_val, skip it
# If new_val is a subset of old_val, skip it unless there are
# new notes that are different than the old ones.
old_val = tmp_a.config.get(conf)
if old_val and 'policy' in old_val:
try:
if old_val['policy'] == old_val['policy'] | new_val['policy']:
continue
except TypeError:
if old_val['policy'] == {**old_val['policy'], **new_val['policy']}:
if old_val['policy'] == old_val['policy'] | new_val['policy']:
if not 'note' in new_val:
continue
if 'note' in old_val and 'note' in new_val:
if old_val['note'] == new_val['note']:
continue
# Write out the policy (and note) line(s)
val = dict(sorted(new_val['policy'].items()))