UBUNTU: [Packaging] annotations: properly merge configs with includes

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2022-12-05 07:26:10 +01:00
parent 0ab043100c
commit d7fd5426bd
1 changed files with 2 additions and 2 deletions
@@ -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("'", '') + "'"