From 04d880852a7fc2cb510a63f6049595b1ca9be970 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Mon, 15 Nov 2021 16:28:26 +0100
Subject: [PATCH] osbuild-mpp: Break out helper function

This breaks out the fakeroot handling used to rewrite a single node.
We'll use this in some new cases later.
---
 tools/osbuild-mpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/osbuild-mpp b/tools/osbuild-mpp
index c9fca462..9abe597b 100755
--- a/tools/osbuild-mpp
+++ b/tools/osbuild-mpp
@@ -561,9 +561,7 @@ class ManifestFile:
             return
 
         for k, v in variables.items():
-            fakeroot = [v]
-            self._process_format(fakeroot)
-            self.vars[k] = fakeroot[0]
+            self.vars[k] = self._rewrite_node(v)
         self.substitute_vars(self.vars)
 
     def get_vars(self):
@@ -666,6 +664,11 @@ class ManifestFile:
         json.dump(self.root, file, indent=2, sort_keys=sort_keys)
         file.write("\n")
 
+    def _rewrite_node(self, node):
+        fakeroot = [node]
+        self._process_format(fakeroot)
+        return fakeroot[0]
+
     def _process_format(self, node):
         def _is_format(node):
             if not isinstance(node, dict):