mirror of
https://github.com/moparisthebest/pacman
synced 2024-08-13 17:03:46 -04:00
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>
This commit is contained in:
parent
b449878fea
commit
8014dc648f
@ -1094,16 +1094,16 @@ remove_deps() {
|
|||||||
# check for packages removed during dependency install (e.g. due to conflicts)
|
# check for packages removed during dependency install (e.g. due to conflicts)
|
||||||
# removing all installed packages is risky in this case
|
# removing all installed packages is risky in this case
|
||||||
if [[ -n $(grep -xvFf <(printf '%s\n' "${current_pkglist[@]}") \
|
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.")"
|
warning "$(gettext "Failed to remove installed dependencies.")"
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
local deplist
|
local deplist
|
||||||
deplist=($(grep -xvFf <(printf "%s\n" "${original_pkglist[@]}") \
|
deplist=($(grep -xvFf <(printf "%s\n" "${original_pkglist[@]}") \
|
||||||
<(printf "%s\n" "${current_pkglist[@]}") || true))
|
<(printf "%s\n" "${current_pkglist[@]}")))
|
||||||
if [[ -z $deplist ]]; then
|
if [[ -z $deplist ]]; then
|
||||||
return
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
msg "Removing installed dependencies..."
|
msg "Removing installed dependencies..."
|
||||||
@ -2674,7 +2674,7 @@ fi
|
|||||||
# set pacman command if not already defined
|
# set pacman command if not already defined
|
||||||
PACMAN=${PACMAN:-pacman}
|
PACMAN=${PACMAN:-pacman}
|
||||||
# save full path to command as PATH may change when sourcing /etc/profile
|
# 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
|
# check if messages are to be printed using color
|
||||||
unset ALL_OFF BOLD BLUE GREEN RED YELLOW
|
unset ALL_OFF BOLD BLUE GREEN RED YELLOW
|
||||||
|
Loading…
Reference in New Issue
Block a user