From 227c5c4d77604d97c09e124bb51305d351f80998 Mon Sep 17 00:00:00 2001 From: Andrea Righi Date: Mon, 11 Dec 2023 10:25:34 +0100 Subject: [PATCH] annotations: properly update configs with included JSON files Fixes: 6d56aaf ("annotations: support JSON format") Signed-off-by: Andrea Righi --- kconfig/annotations.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"])) -- 2.31.1