diff options
| author | Allan McRae <allan@archlinux.org> | 2019-06-25 13:56:58 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2019-06-25 13:56:58 +0200 |
| commit | d917109432665a6c7ca903fa727cf9a0dc9c7a0c (patch) | |
| tree | 4fab34853d8b8f6aad498c6046799a8bd1603759 | |
| parent | 30acc87b7dfb1d0cf3b7ca5097e47b595b798076 (diff) | |
| download | pacman-d917109432665a6c7ca903fa727cf9a0dc9c7a0c.tar.gz pacman-d917109432665a6c7ca903fa727cf9a0dc9c7a0c.tar.xz | |
makepkg: do not exit immediately on dependency install failures
Fixes FS#63000
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index aa03e9d9..43484db3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -273,7 +273,7 @@ handle_deps() { if ! run_pacman -S --asdeps "${deplist[@]}"; then error "$(gettext "'%s' failed to install missing dependencies.")" "$PACMAN" - exit $E_INSTALL_DEPS_FAILED + return $R_DEPS_MISSING fi fi @@ -303,7 +303,7 @@ resolve_deps() { if handle_deps "${deplist[@]}"; then # 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 fi |