index : pacman | |
Archlinux32 fork of pacman | gitolite user |
summaryrefslogtreecommitdiff |
author | Dave Reisner <dreisner@archlinux.org> | 2011-09-10 23:21:22 -0400 |
---|---|---|
committer | Allan McRae <allan@archlinux.org> | 2011-09-11 13:47:07 +1000 |
commit | c736a12e86b826f3079f3cccde86d497528f85f3 (patch) | |
tree | 1912678ef26a48ecc6ae8b8e0c3ea3ce33801d2b /scripts | |
parent | 7f1235ccbc3a81a4f8a50de96cea512353d6773e (diff) |
-rw-r--r-- | scripts/makepkg.sh.in | 4 |
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5981603b..b678f7e5 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -474,11 +474,13 @@ handle_deps() { fi # we might need the new system environment - # avoid triggering the ERR trap + # avoid triggering the ERR trap and exiting + set +e local restoretrap=$(trap -p ERR) trap - ERR source /etc/profile &>/dev/null eval $restoretrap + set -e return $R_DEPS_SATISFIED } |