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

tools/osbuild-mpp: Really fix empty ostree commit object in deploy stage

Browse source 
The fix in 980ca03685 ensured that
no empty commit object was changed, but it still created an (empty)
input object, which causes failures, like:
 https://gitlab.com/CentOS/automotive/sample-images/-/merge_requests/388

We need to move the check before the line that adds the empty default
input object.
This commit is contained in:
Alexander Larsson 2023-10-17 11:49:40 +02:00 • committed by Achilleas Koutsou
parent 7c35b945ee
commit 745f86c94c
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tools/osbuild-mpp
View file

@ -1621,8 +1621,6 @@ class ManifestFileV2(ManifestFile):
["org.osbuild.ostree.pull", "org.osbuild.ostree.deploy"]:
return
inputs = element_enter(stage, "inputs", {})
# The ostree.deploy stage accepts both containers or
# ostree commits as input. If this is an ostree.deploy
# stage and there are no commits in the inputs then let's
@ -1630,9 +1628,11 @@ class ManifestFileV2(ManifestFile):
# from being created when a container image is used as
# an input to ostree.deploy and not an ostree commit.
if stage.get("type", "") == "org.osbuild.ostree.deploy":
if "commits" not in inputs:
if "commits" not in stage.get("inputs", {}):
return
inputs = element_enter(stage, "inputs", {})
inputs_commits = element_enter(inputs, "commits", {})
if inputs_commits.get("type", "") != "org.osbuild.ostree":