Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2014-02-02 17:37:58 +1000
committerAllan McRae <allan@archlinux.org>2014-02-02 17:37:58 +1000
commit8014dc648f7a1f9b30200905b5e0cab776a6f0e4 (patch)
tree4450ed1c18e2a37620660c32f5de37317cccc7f1 /scripts
parentb449878feaf3ddf49557632bd52c987a3a3a782c (diff)
makepkg: remove unneeded "|| true"
makepkg only aborts on errors during PKGBUILD functions so the remaining "|| true" statements are unneeded. Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/makepkg.sh.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index ce6c9dac..b69c0710 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1094,16 +1094,16 @@ remove_deps() {
# check for packages removed during dependency install (e.g. due to conflicts)
# removing all installed packages is risky in this case
if [[ -n $(grep -xvFf <(printf '%s\n' "${current_pkglist[@]}") \
- <(printf '%s\n' "${original_pkglist[@]}") || true) ]]; then
+ <(printf '%s\n' "${original_pkglist[@]}")) ]]; then
warning "$(gettext "Failed to remove installed dependencies.")"
return 0
fi
local deplist
deplist=($(grep -xvFf <(printf "%s\n" "${original_pkglist[@]}") \
- <(printf "%s\n" "${current_pkglist[@]}") || true))
+ <(printf "%s\n" "${current_pkglist[@]}")))
if [[ -z $deplist ]]; then
- return
+ return 0
fi
msg "Removing installed dependencies..."
@@ -2674,7 +2674,7 @@ fi
# set pacman command if not already defined
PACMAN=${PACMAN:-pacman}
# save full path to command as PATH may change when sourcing /etc/profile
-PACMAN_PATH=$(type -P $PACMAN) || true
+PACMAN_PATH=$(type -P $PACMAN)
# check if messages are to be printed using color
unset ALL_OFF BOLD BLUE GREEN RED YELLOW