From ce9bb994f86f9653dc293f2dda0f8f2160964090 Mon Sep 17 00:00:00 2001 From: Cedric Staniewski Date: Tue, 10 Nov 2009 20:47:09 +0100 Subject: 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 for finding this solution. Signed-off-by: Cedric Staniewski Signed-off-by: Xavier Chantry Signed-off-by: Dan McGee (cherry picked from commit 77e84bea71e3dfe87a8009e7e7a913d1a12b7585) Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 7 ++++--- 1 file 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 } -- cgit v1.2.3