From fdb0faca86ccb96f8869f2da87b02c0906ff4c06 Mon Sep 17 00:00:00 2001
From: Christian Kellner <christian@kellner.me>
Date: Mon, 12 Jul 2021 13:55:29 +0000
Subject: [PATCH] tools/mpp: extract vars initialization

Move the initialization for manifest vars out of `__init__`.
---
 tools/osbuild-mpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/tools/osbuild-mpp b/tools/osbuild-mpp
index f88747fb..8d6340e1 100755
--- a/tools/osbuild-mpp
+++ b/tools/osbuild-mpp
@@ -538,9 +538,15 @@ class ManifestFile:
         self.source_urls = {}
 
         self.vars = {}
-        if "mpp-vars" in root:
-            self.vars = root["mpp-vars"]
-            del root["mpp-vars"]
+        self.init_vars()
+
+    def init_vars(self):
+        variables = self.root.get("mpp-vars")
+        if not variables:
+            return
+
+        self.vars.update(variables)
+        del self.root["mpp-vars"]
 
     def set_vars(self, args):
         for arg in args: