summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-04-30 06:55:20 +0000
committerZac Medico <zmedico@gentoo.org>2009-04-30 06:55:20 +0000
commit7ee8f5c848b21198de6f734d3a4b4158144ab2f6 (patch)
treeb3405180c5fe9a632f1f484153649714ba6d568b /bin
parentRemove the ATOMS section and move --update to a new ACTIONS section. (diff)
downloadportage-multirepo-7ee8f5c848b21198de6f734d3a4b4158144ab2f6.tar.gz
portage-multirepo-7ee8f5c848b21198de6f734d3a4b4158144ab2f6.tar.bz2
portage-multirepo-7ee8f5c848b21198de6f734d3a4b4158144ab2f6.zip
Bug #264494 - In case the ebuild has enabled set -e during an ebuild phase,
proactively call set +e inside qa_source(), qa_call(), and die(). (trunk r13273) svn path=/main/branches/2.1.6/; revision=13452
Diffstat (limited to 'bin')
-rwxr-xr-xbin/ebuild.sh2
-rwxr-xr-xbin/isolated-functions.sh1
2 files changed, 3 insertions, 0 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 04cfe636..d1e2e8fd 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -35,6 +35,7 @@ qa_source() {
local retval
source "$@"
retval=$?
+ set +e
[[ $shopts != $(shopt) ]] &&
eqawarn "QA Notice: Global shell options changed and were not restored while sourcing '$*'"
[[ "$IFS" != "$OLDIFS" ]] &&
@@ -47,6 +48,7 @@ qa_call() {
local retval
"$@"
retval=$?
+ set +e
[[ $shopts != $(shopt) ]] &&
eqawarn "QA Notice: Global shell options changed and were not restored while calling '$*'"
[[ "$IFS" != "$OLDIFS" ]] &&
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 8eab6e25..9abfc308 100755
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -54,6 +54,7 @@ dump_trace() {
}
die() {
+ set +e
if [ -n "${QA_INTERCEPTORS}" ] ; then
# die was called from inside inherit. We need to clean up
# QA_INTERCEPTORS since sed is called below.