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

inputs/ostree.checkout: don't overwrite refs

Browse source 
The `refs` variable is used as parameter to indicate which commits
to checkout, but it also was used as result variable to store the
ids of the commits that actually got checked out; naturally, it
was initialized to the empty array. This of course meant nothing
was ever actually checked out. Doh.
This commit is contained in:
Christian Kellner 2021-08-23 21:51:00 +00:00 • committed by Tom Gundersen
parent da8f45ef48
commit ca3941feb6
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
inputs/org.osbuild.ostree.checkout
View file

@ -82,7 +82,7 @@ class OSTreeCheckoutInput(inputs.InputService):
def map(self, store, origin, refs, target, _options):
refs = []
ids = []
if origin == "org.osbuild.pipeline":
for ref, options in refs.items():
@ -90,16 +90,16 @@ class OSTreeCheckoutInput(inputs.InputService):
with open(os.path.join(source, "compose.json"), "r") as f:
compose = json.load(f)
commit_id = compose["ostree-commit"]
refs.append(checkout({commit_id: options}, source, target))
ids.append(checkout({commit_id: options}, source, target))
else:
source = store.source("org.osbuild.ostree")
refs = checkout(refs, source, target)
ids = checkout(refs, source, target)
reply = {
"path": target,
"data": {
"refs": {ref: {"path": ref} for ref in refs}
}
"path": target,
"data": {
"refs": {i: {"path": i} for i in ids}
}
}
return reply