From 1af4fc7f2a97eb191f1ca7b0983939d203629a72 Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Wed, 12 Aug 2020 15:51:59 +0200 Subject: [PATCH] assemblers/ostree.commit: regroup code for clarity Re-order the os_version metadata conditional to group all the optional metadata together. This should make it clearer what belongs together. --- assemblers/org.osbuild.ostree.commit | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/assemblers/org.osbuild.ostree.commit b/assemblers/org.osbuild.ostree.commit index 60ae9830..af4b2fe2 100755 --- a/assemblers/org.osbuild.ostree.commit +++ b/assemblers/org.osbuild.ostree.commit @@ -145,17 +145,16 @@ def main(tree, output_dir, options, meta): if parent: argv += [f"--parent={parent}"] - argv += [ - f"--add-metadata-string=rpmostree.inputhash={meta['id']}", - f"--write-composejson-to={output_dir}/compose.json" - - ] - if os_version: argv += [ f"--add-metadata-string=version={os_version}", ] + argv += [ + f"--add-metadata-string=rpmostree.inputhash={meta['id']}", + f"--write-composejson-to={output_dir}/compose.json" + ] + with treefile.as_tmp_file() as path: argv += [path, root]