diff options
| author | Cedric Staniewski <cedric@gmx.ca> | 2009-11-10 20:47:09 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2010-01-19 21:56:36 -0600 |
| commit | ce9bb994f86f9653dc293f2dda0f8f2160964090 (patch) | |
| tree | 4b40b7c11f00d5225a5c66461e7b8b0c55bdd18e | |
| parent | 0c3f5020645ab5ab28113322e33abdeeb2b34a63 (diff) | |
makepkg: fix abortion after sourcing /etc/profile
The source command triggers / might trigger the ERR trap which makes
makepkg abort right after a successful installation of missing
dependencies.
Thanks to Xavier Chantry <shiningxc@gmail.com> for finding this
solution.
Signed-off-by: Cedric Staniewski <cedric@gmx.ca>
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
(cherry picked from commit 77e84bea71e3dfe87a8009e7e7a913d1a12b7585)
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 929f43f9..f58e2742 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -385,10 +385,11 @@ handledeps() { fi # we might need the new system environment - # set -e can cause problems during sourcing profile scripts - set +e + # avoid triggering the ERR trap + local restoretrap=$(trap -p ERR) + trap - ERR source /etc/profile &>/dev/null - set -e + eval $restoretrap return $R_DEPS_SATISFIED } |