These 'set +E' diversions haven't been needed since global errexit was
disabled in dca10b062f2 (January 2012).
---
scripts/makepkg.sh.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 02398cf..a1385c1 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -276,12 +276,12 @@ resolve_deps() {
# deplist cannot be declared like this: local deplist=$(foo)
# Otherwise, the return value will depend on the assignment.
local deplist
- deplist="$(set +E; check_deps $*)" || exit 1
+ deplist="$(check_deps $*)" || exit 1
[[ -z $deplist ]] && return $R_DEPS_SATISFIED
if handle_deps $deplist; then
# check deps again to make sure they were resolved
- deplist="$(set +E; check_deps $*)" || exit 1
+ deplist="$(check_deps $*)" || exit 1
[[ -z $deplist ]] && return $R_DEPS_SATISFIED
fi
@@ -959,7 +959,7 @@ check_vcs_software() {
client=$(get_vcsclient "$proto") ||
exit $?
# ensure specified program is installed
local uninstalled
- uninstalled="$(set +E; check_deps
$client)" || exit 1
+ uninstalled="$(check_deps $client)" ||
exit 1
# if not installed, check presence in
depends or makedepends
if [[ -n "$uninstalled" ]] && (( !
NODEPS || ( VERIFYSOURCE && !DEP_BIN ) )); then
if ! in_array "$client"
${all_deps[@]}; then
--
2.10.2
