makechroot: download_sources: Accept makepkg_owner as an argument
What this is really doing is fixing a conflict that I had incorrectly resolved when rebasing what became2fd5931
ontocda9cf4
. Of course, because of dynamic scoping, everything worked out, and everything worked as intended. Beforecda9cf4
, it was appropriate for download_sources to take src_owner as an argument, but aftercda9cf4
, it is now appropriate to take makepkg_user as an argument. However, it still takes src_owner as an argument, but pays 0 attention to it; instead looking at makepkg_user which it happily inherited because of dynamic scoping. So change it to take makepkg_user as the argument.
This commit is contained in:
parent
31a800fd88
commit
4f23609d4e
|
@ -252,20 +252,19 @@ _chrootnamcap() {
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
# Usage: download_sources $copydir $src_owner
|
# Usage: download_sources $copydir $makepkg_user
|
||||||
# Globals:
|
# Globals:
|
||||||
# - SRCDEST
|
# - SRCDEST
|
||||||
# - USER
|
# - USER
|
||||||
download_sources() {
|
download_sources() {
|
||||||
local copydir=$1
|
local copydir=$1
|
||||||
local src_owner=$2
|
local makepkg_user=$2
|
||||||
|
|
||||||
local builddir="$(mktemp -d)"
|
local builddir="$(mktemp -d)"
|
||||||
chmod 1777 "$builddir"
|
chmod 1777 "$builddir"
|
||||||
|
|
||||||
# Ensure sources are downloaded
|
# Ensure sources are downloaded
|
||||||
makepkg_user=${makepkg_user:-$SUDO_USER}
|
if [[ "$(id -u "$makepkg_user")" != 0 ]]; then
|
||||||
if [[ -n $makepkg_user ]]; then
|
|
||||||
sudo -u "$makepkg_user" env SRCDEST="$SRCDEST" BUILDDIR="$builddir" \
|
sudo -u "$makepkg_user" env SRCDEST="$SRCDEST" BUILDDIR="$builddir" \
|
||||||
makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o
|
makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o
|
||||||
else
|
else
|
||||||
|
@ -332,6 +331,7 @@ main() {
|
||||||
|
|
||||||
[[ ! -f PKGBUILD && -z "${install_pkgs[*]}" ]] && die 'This must be run in a directory containing a PKGBUILD.'
|
[[ ! -f PKGBUILD && -z "${install_pkgs[*]}" ]] && die 'This must be run in a directory containing a PKGBUILD.'
|
||||||
[[ -n $makepkg_user && -z $(id -u "$makepkg_user") ]] && die 'Invalid makepkg user.'
|
[[ -n $makepkg_user && -z $(id -u "$makepkg_user") ]] && die 'Invalid makepkg user.'
|
||||||
|
makepkg_user=${makepkg_user:-${SUDO_USER:-$USER}}
|
||||||
|
|
||||||
check_root
|
check_root
|
||||||
|
|
||||||
|
@ -394,7 +394,7 @@ main() {
|
||||||
[[ -f PKGBUILD ]] || return $ret
|
[[ -f PKGBUILD ]] || return $ret
|
||||||
fi
|
fi
|
||||||
|
|
||||||
download_sources "$copydir" "$src_owner"
|
download_sources "$copydir" "$makepkg_user"
|
||||||
|
|
||||||
prepare_chroot "$copydir" "$USER_HOME" "$repack"
|
prepare_chroot "$copydir" "$USER_HOME" "$repack"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue