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.
This commit is contained in:
parent
30ad32b174
commit
1af4fc7f2a
1 changed files with 5 additions and 6 deletions
|
|
@ -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]
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue