From d7fd5426bd98b4b62941bbdf76b3c72f1b4b85a9 Mon Sep 17 00:00:00 2001 From: Andrea Righi Date: Mon, 5 Dec 2022 07:26:10 +0100 Subject: [PATCH] UBUNTU: [Packaging] annotations: properly merge configs with includes Signed-off-by: Andrea Righi --- debian/scripts/misc/kconfig/annotations.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/scripts/misc/kconfig/annotations.py b/debian/scripts/misc/kconfig/annotations.py index 7645fd1da807..0225e9dcf66e 100644 --- a/debian/scripts/misc/kconfig/annotations.py +++ b/debian/scripts/misc/kconfig/annotations.py @@ -103,10 +103,10 @@ class Annotation(Config): if conf in config: entry = config[conf] else: - entry = {} + entry = {'policy': {}} m = re.match(r'.*policy<(.*)>', line) if m: - entry['policy'] = literal_eval(m.group(1)) + entry['policy'] |= literal_eval(m.group(1)) m = re.match(r'.*note<(.*?)>', line) if m: entry['note'] = "'" + m.group(1).replace("'", '') + "'"