From a23fc08758cbbc7aa861eee2f537d4e1048bb039 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Tue, 12 Aug 2008 01:26:39 +1000 Subject: Fix error when sourcing profile script With the "set -e" property set, a failure when sourcing /etc/profile can cause makepkg to exit without error message. The bash-completion package activates this bug. Fixes FS#11179. Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c5dbed9f..b230b786 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -341,7 +341,10 @@ handledeps() { fi # we might need the new system environment + # set -e can cause problems during sourcing profile scripts + set +e source /etc/profile &>/dev/null + set -e return $R_DEPS_SATISFIED } -- cgit v1.2.3-70-g09d2