summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Giokas <1007380@gmail.com>2013-03-15 12:11:11 -0500
committerAllan McRae <allan@archlinux.org>2013-04-11 10:53:52 +1000
commitb7c994db8b049b87df5ec5d6cada84a36c60c47d (patch)
tree7358f810653c561606cec8ee69ad2ac3277a2638
parent3de8f8f1ccf103ae9737299b52407b4ebe51d75a (diff)
downloadpacman-b7c994db8b049b87df5ec5d6cada84a36c60c47d.tar.xz
makepkg: don't run remove_deps twice when unneeded
remove_deps already has a check and won't run unless -r is specified, so if this was meant to remove dependencies of a failure no matter what, then it's not doing it, and with -r it is run twice on a failure for no real reason. Signed-off-by: William Giokas <1007380@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in1
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index da620a45..c2f89c97 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1356,7 +1356,6 @@ error_function() {
if (( ! BASH_SUBSHELL )); then
error "$(gettext "A failure occurred in %s().")" "$1"
plain "$(gettext "Aborting...")"
- remove_deps
fi
exit 2 # $E_BUILD_FAILED
}