From b52aae31147f92fe06338af5e28fd22cc754053e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 26 Jun 2019 12:52:59 +0200 Subject: [PATCH] xbps-src: do not ignore EEXIST rval from xbps-install(1). Due to -I it cannot return EEXIST, and this error value shall be treated as a real error. Does not change the current behaviour but will do if we drop -I. --- common/xbps-src/shutils/build_dependencies.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/common/xbps-src/shutils/build_dependencies.sh b/common/xbps-src/shutils/build_dependencies.sh index bbf2a067cd..9bf37cdfc9 100644 --- a/common/xbps-src/shutils/build_dependencies.sh +++ b/common/xbps-src/shutils/build_dependencies.sh @@ -65,7 +65,7 @@ setup_pkg_depends() { # Install a required package dependency, like: # -# xbps-install -Ay +# xbps-install -IAy # # Returns 0 if package already installed or installed successfully. # Any other error number otherwise. @@ -93,7 +93,7 @@ install_pkg_from_repos() { # ENOTSUP (95): no repositories registered. # case "$rval" in - 0|17) # success, check if there are errors. + 0) # success, check if there are errors. errortmpf=$(mktemp) || exit 1 grep ^ERROR $tmplogf > $errortmpf [ -s $errortmpf ] && cat $errortmpf @@ -107,8 +107,7 @@ install_pkg_from_repos() { msg_error "Please see above for the real error, exiting...\n" ;; esac - [ $rval -eq 17 ] && rval=0 - rm -f $logtmpf + rm -f $tmplogf return $rval }