Compare commits

..

2 Commits

Author SHA1 Message Date
Junxuan Liao
fee1f6b226 Merge branch 'master' into 'master'
fix(makechrootpkg): add environmental variables to verifysource_args

Closes #197

See merge request archlinux/devtools!217
2025-07-30 21:24:34 +00:00
Liao Junxuan
15d920765a fix(makechrootpkg): add environmental variables to verifysource_args
This is useful for setting proxies for downloading files. Fixes #197.
2025-07-22 04:45:30 +00:00
2 changed files with 4 additions and 1 deletions

View File

@@ -80,7 +80,7 @@ check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAG
makechrootpkg_args+=("${@:$OPTIND}")
# Automatically recreate the root chroot if a version mismatch is detected
CURRENT_CHROOT_VERSION=$(cat "${chroots}/${repo}-${arch}/root/.arch-chroot" 2>/dev/null)
CURRENT_CHROOT_VERSION=$(cat "${chroots}/${repo}-${arch}/root/.arch-chroot")
if [[ -f "${chroots}/${repo}-${arch}/root/.arch-chroot" ]] && [[ "$CURRENT_CHROOT_VERSION" != "$CHROOT_VERSION" ]]; then
warning "Recreating chroot '%s' (%s) as it is not at version %s" "${chroots}/${repo}-${arch}/root" "$CURRENT_CHROOT_VERSION" "$CHROOT_VERSION"
clean_first=true

View File

@@ -345,6 +345,9 @@ for arg in "${@:$OPTIND}"; do
-*A*) verifysource_args+=(-A) ;;&
-*R*|-*e*) keepbuilddir=1 ;;&
esac
if [[ $arg != -* && $arg == *=* ]]; then
verifysource_args+=("$arg")
fi
done
umask 0022