Skip to content

Commit

Permalink
ostree.encapsulate: It's rpm-ostree, not ostree
Browse files Browse the repository at this point in the history
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
 coreos/rpm-ostree#4527 )
  • Loading branch information
cgwalters authored and supakeen committed Aug 5, 2023
1 parent 427e82e commit ef7cbfa
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions stages/org.osbuild.ostree.encapsulate
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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__':
Expand Down

0 comments on commit ef7cbfa

Please sign in to comment.