diff options
| author | Allan McRae <allan@archlinux.org> | 2008-08-12 01:26:39 +1000 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-08-13 21:09:38 -0500 |
| commit | a23fc08758cbbc7aa861eee2f537d4e1048bb039 (patch) | |
| tree | 4376453ea719d2214b42055a84d199afca7606d0 /scripts | |
| parent | 57bd8974c73571d827617f4df0a6917f13696493 (diff) | |
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 <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/makepkg.sh.in | 3 |
1 files changed, 3 insertions, 0 deletions
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 } |