particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

osbuild-mpp: Break out helper function

Browse source 
This breaks out the fakeroot handling used to rewrite a single node.
We'll use this in some new cases later.
This commit is contained in:
Alexander Larsson 2021-11-15 16:28:26 +01:00 • committed by Christian Kellner
parent 7fe8b922b4
commit 04d880852a
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tools/osbuild-mpp
View file

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