moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

makepkg: save path to PACMAN and test availability 

After we install dependencies, we source /etc/profile so that new
elements get added to the path. As this can override any local setting
of PATH, we store the full path of the PACMAN variable passed to makepkg.

Also, add a check for PACMAN availability if it is needed to deal with any
dependency operations.

Reported-by: Martin Panter <vadmium à gmail·com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2012-11-13 13:04:21 +10:00
parent 86233476b0
commit 3531533c2f
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/makepkg.sh.in
View File

@ -874,9 +874,9 @@ source_has_signatures() {
run_pacman() { run_pacman() {
local cmd local cmd
if [[ ! $1 = -@(T|Qq) ]]; then if [[ ! $1 = -@(T|Qq) ]]; then
cmd=("$PACMAN" $PACMAN_OPTS "$@") cmd=("$PACMAN_PATH" $PACMAN_OPTS "$@")
else else
cmd=("$PACMAN" "$@") cmd=("$PACMAN_PATH" "$@")
fi fi
if (( ! ASROOT )) && [[ ! $1 = -@(T|Qq) ]]; then if (( ! ASROOT )) && [[ ! $1 = -@(T|Qq) ]]; then
if type -p sudo >/dev/null; then if type -p sudo >/dev/null; then
@ -2108,6 +2108,14 @@ check_software() {
# check for needed software # check for needed software
local ret=0 local ret=0
# check for PACMAN if we need it
if (( ! INFAKEROOT && ( ! NODEPS || DEP_BIN || RMDEPS || INSTALL ) )); then
if [[ -z $PACMAN_PATH ]]; then
error "$(gettext "Cannot find the %s binary required for dependency operations.")" "$PACMAN"
ret=1
fi
fi
# check for sudo if we will need it during makepkg execution # check for sudo if we will need it during makepkg execution
if (( ! ( ASROOT || INFAKEROOT ) && ( DEP_BIN || RMDEPS || INSTALL ) )); then if (( ! ( ASROOT || INFAKEROOT ) && ( DEP_BIN || RMDEPS || INSTALL ) )); then
if ! type -p sudo >/dev/null; then if ! type -p sudo >/dev/null; then
@ -2464,6 +2472,8 @@ fi
# set pacman command if not already defined # set pacman command if not already defined
PACMAN=${PACMAN:-pacman} PACMAN=${PACMAN:-pacman}
# save full path to command as PATH may change when sourcing /etc/profile
PACMAN_PATH=$(type -P $PACMAN) || true
# check if messages are to be printed using color # check if messages are to be printed using color
unset ALL_OFF BOLD BLUE GREEN RED YELLOW unset ALL_OFF BOLD BLUE GREEN RED YELLOW
@ -2738,7 +2748,7 @@ if (( NODEPS || (NOBUILD && !DEP_BIN ) )); then
if (( NODEPS )); then if (( NODEPS )); then
warning "$(gettext "Skipping dependency checks.")" warning "$(gettext "Skipping dependency checks.")"
fi fi
elif type -p "$PACMAN" >/dev/null; then else
if (( RMDEPS && ! INSTALL )); then if (( RMDEPS && ! INSTALL )); then
original_pkglist=($(run_pacman -Qq)) # required by remove_dep original_pkglist=($(run_pacman -Qq)) # required by remove_dep
fi fi
@ -2766,8 +2776,6 @@ elif type -p "$PACMAN" >/dev/null; then
error "$(gettext "Could not resolve all dependencies.")" error "$(gettext "Could not resolve all dependencies.")"
exit 1 exit 1
fi fi
else
warning "$(gettext "%s was not found in %s; skipping dependency checks.")" "$PACMAN" "PATH"
fi fi
# ensure we have a sane umask set # ensure we have a sane umask set