bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makepkg: do not exit immediately on dependency install failures

Browse source 
Fixes FS#63000

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2019-06-25 21:56:58 +10:00
parent 30acc87b7d
commit d917109432
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/makepkg.sh.in
View file

@ -273,7 +273,7 @@ handle_deps() {
if ! run_pacman -S --asdeps "${deplist[@]}"; then if ! run_pacman -S --asdeps "${deplist[@]}"; then
error "$(gettext "'%s' failed to install missing dependencies.")" "$PACMAN" error "$(gettext "'%s' failed to install missing dependencies.")" "$PACMAN"
exit $E_INSTALL_DEPS_FAILED return $R_DEPS_MISSING
fi fi
fi fi
@ -303,7 +303,7 @@ resolve_deps() {
if handle_deps "${deplist[@]}"; then if handle_deps "${deplist[@]}"; then
# check deps again to make sure they were resolved # check deps again to make sure they were resolved
deplist=$(check_deps "$@") || exit $E_INSTALL_DEPS_FAILED deplist=$(check_deps "$@")
[[ -z $deplist ]] && return $R_DEPS_SATISFIED [[ -z $deplist ]] && return $R_DEPS_SATISFIED
fi fi