From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 30 Apr 2009 06:55:20 +0000 (-0000)
Subject: Bug #264494 - In case the ebuild has enabled set -e during an ebuild phase,
X-Git-Tag: v2.1.6.12~121
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7ee8f5c848b21198de6f734d3a4b4158144ab2f6;p=portage.git

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
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 04cfe6369..d1e2e8fd0 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 8eab6e259..9abfc308a 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.