Skip to content

Commit 532ad84

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 40a2027 commit 532ad84

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
@@ -572,34 +572,6 @@ runcompose_tree() {
572572
fi
573573
}
574574

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

0 commit comments

Comments
 (0)