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

ostree.encapsulate: It's rpm-ostree, not ostree

Browse source 
We have a lot of copypasta of `def ostree()` but in this
case it's actually rpm-ostree, and we should be clear about that.

(Also in the future this code will need to change
 to use the non-deprecated entrypoint, see
 https://github.com/coreos/rpm-ostree/pull/4527 )
This commit is contained in:
Colin Walters 2023-08-04 08:45:33 -04:00 • committed by Simon de Vlieger
parent 427e82e0c0
commit 6f81c59894
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
stages/org.osbuild.ostree.encapsulate
View file

@ -69,7 +69,7 @@ SCHEMA_2 = """
"""
def ostree(*args, **kwargs):
def rpmostree(*args, **kwargs):
args = list(args) + [f'--{k}={v}' for k, v in kwargs.items()]
print("rpm-ostree " + " ".join(args), file=sys.stderr)
subprocess.run(["rpm-ostree"] + args,
@ -109,10 +109,10 @@ def main(tree, inputs, options):
if maxlayers:
extra_args += ["--max-layers", str(maxlayers)]
ostree("container-encapsulate", commit, container,
"--format-version", str(formatver),
"--repo", source_repo,
*extra_args)
rpmostree("container-encapsulate", commit, container,
"--format-version", str(formatver),
"--repo", source_repo,
*extra_args)
if __name__ == '__main__':