[pacman-dev] [PATCH] makepkg: do not exit immediately on dependency install failures
Allan McRae
allan at archlinux.org
Tue Jun 25 11:58:53 UTC 2019
Fixes FS#63000
Signed-off-by: Allan McRae <allan at archlinux.org>
---
scripts/makepkg.sh.in | 4 ++--
1 file 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
--
2.22.0
More information about the pacman-dev
mailing list