Skip to content

Commit

Permalink
cmd-build: move --write-composejson-to switch to cmdlib
Browse files Browse the repository at this point in the history
Now that the variable is declared publicly, we can just add it to the
list of rpm-ostree args as part of the compose helper.

This has no functional change in the `cosa build` path. In the
`cosa fetch` path, this will add the switch but rpm-ostree will ignore
it since we're not actually writing a commit.

(cherry picked from commit 4be28b6)
  • Loading branch information
jlebon authored and dustymabe committed Nov 15, 2022
1 parent 4cf714c commit 5abed38
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
1 change: 0 additions & 1 deletion src/cmd-build
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,6 @@ if test -n "${previous_commit}"; then
fi
RUNVM_NONET=1 runcompose_tree --cache-only ${FORCE} \
--add-metadata-from-json "${commitmeta_input_json}" \
--write-composejson-to "${composejson}" \
--ex-write-lockfile-to "${lockfile_out}".tmp \
"${extra_compose_args[@]}"
strip_out_lockfile_digests "$lockfile_out".tmp
Expand Down
1 change: 1 addition & 0 deletions src/cmdlib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,7 @@ runcompose_tree() {
rm -f "${changed_stamp}"
# shellcheck disable=SC2086
set - ${COSA_RPMOSTREE_GDB:-} rpm-ostree compose tree --repo="${repo}" \
--write-composejson-to "${composejson}" \
--touch-if-changed "${changed_stamp}" --cachedir="${workdir}"/cache \
${COSA_RPMOSTREE_ARGS:-} --unified-core "${manifest}" "$@"

Expand Down

0 comments on commit 5abed38

Please sign in to comment.