From: Andrea Righi <andrea.righi@canonical.com>
Date: Mon, 11 Dec 2023 09:25:34 +0000 (+0100)
Subject: annotations: properly update configs with included JSON files
X-Git-Tag: v0.2~9
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=227c5c4d77604d97c09e124bb51305d351f80998;p=annotations.git

annotations: properly update configs with included JSON files

Fixes: 6d56aaf ("annotations: support JSON format")
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
---

diff --git a/kconfig/annotations.py b/kconfig/annotations.py
index 44c6f66..cf02802 100644
--- a/kconfig/annotations.py
+++ b/kconfig/annotations.py
@@ -203,7 +203,7 @@ class Annotation(Config):
             # We are procesing an imported annotations, so merge all the
             # configs and attributes.
             try:
-                self.config |= data["config"]
+                self.config = data["config"] | self.config
             except TypeError:
                 self.config = {**self.config, **data["config"]}
             self.arch = list(set(self.arch) | set(data["attributes"]["arch"]))