Skip to content

Commit 25eb787

Browse files
committed
cmdlib.sh: drop runcompose_extensions()
This was used as part of the legacy building of extensions and should have been dropped alongside that code in 48414b3.
1 parent db738cd commit 25eb787

File tree

1 file changed

+0
-28
lines changed

1 file changed

+0
-28
lines changed

src/cmdlib.sh

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -574,34 +574,6 @@ runcompose_tree() {
574574
fi
575575
}
576576

577-
runcompose_extensions() {
578-
local outputdir=$1; shift
579-
local workdir=${workdir:-$(pwd)}
580-
local repo=${tmprepo:-${workdir}/tmp/repo}
581-
582-
rm -f "${changed_stamp}"
583-
# shellcheck disable=SC2086
584-
set - ${COSA_RPMOSTREE_GDB:-} rpm-ostree compose extensions --repo="${repo}" \
585-
--touch-if-changed "${changed_stamp}" --cachedir="${workdir}"/cache \
586-
${COSA_RPMOSTREE_ARGS:-} "$@" --output-dir "$outputdir"
587-
588-
echo "Running: $*"
589-
590-
# this is the heart of the privs vs no privs dual path
591-
if has_privileges; then
592-
# we hardcode a umask of 0022 here to make sure that composes are run
593-
# with a consistent value, regardless of the environment
594-
(umask 0022 && sudo -E "$@")
595-
sudo chown -R -h "${USER}":"${USER}" "${outputdir}"
596-
else
597-
# Use a snapshot version of the cache qcow2 to allow multiple users
598-
# of the cache at the same time. This is needed because the extensions
599-
# and other artifacts are built in parallel.
600-
local snapshot='on'
601-
runvm_with_cache_snapshot "${snapshot}" -- "$@"
602-
fi
603-
}
604-
605577
# Run with cache disk with optional snapshot=on, which means no changes get written back to
606578
# the cache disk. `runvm_with_cache_snapshot on` will set snapshotting to on.
607579
runvm_with_cache_snapshot() {

0 commit comments

Comments
 (0)