summaryrefslogtreecommitdiffstats
path: root/scripts/libmakepkg/executable/pacman.sh.in
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2018-11-28 05:00:36 +0100
committerAllan McRae <allan@archlinux.org>2018-12-04 08:22:27 +0100
commit9f1b735d76d04665d6324e723e163a52ca27567c (patch)
treefd58de354872e9343d90e97ba8630417ab017db7 /scripts/libmakepkg/executable/pacman.sh.in
parent65e09705d3ad781fd41cf1996f2b60e2e2c1975b (diff)
downloadpacman-9f1b735d76d04665d6324e723e163a52ca27567c.tar.gz
pacman-9f1b735d76d04665d6324e723e163a52ca27567c.tar.xz
libmakepkg/executable: don't rely on scoped value of $ret to flag outcomes
Elsewhere, we return 1 if a library dropin fails, and when running functions in a loop, we use `|| ret=1` to preserve scope. This ensures the return value of the function remains useful in isolation. Do the same thing here as well. Drop trivial function which wraps a dropin that also uses $ret, since it's no longer needed. Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts/libmakepkg/executable/pacman.sh.in')
-rw-r--r--scripts/libmakepkg/executable/pacman.sh.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/libmakepkg/executable/pacman.sh.in b/scripts/libmakepkg/executable/pacman.sh.in
index d9967f45..d1433ffd 100644
--- a/scripts/libmakepkg/executable/pacman.sh.in
+++ b/scripts/libmakepkg/executable/pacman.sh.in
@@ -31,7 +31,7 @@ executable_pacman() {
if (( ! NODEPS || DEP_BIN || RMDEPS || INSTALL )); then
if [[ -z $PACMAN_PATH ]]; then
error "$(gettext "Cannot find the %s binary required for dependency operations.")" "$PACMAN"
- ret=1
+ return 1
fi
fi
}