From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 20 Nov 2007 21:58:03 +0000 (-0000)
Subject: Make diefunc() clean up QA_INTERCEPTORS in case it is
X-Git-Tag: v2.1.4~270
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=87c0e3c842f3eeeb60cda62f92d19a52f5563a4d;p=portage.git

Make diefunc() clean up QA_INTERCEPTORS in case it is
called from inherit() since sed called below. (trunk
r8490)

svn path=/main/branches/2.1.2/; revision=8553
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 8ede30a95..0a6694ce2 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -289,7 +289,12 @@ register_die_hook() {
 diefunc() {
 	local funcname="$1" lineno="$2" exitcode="$3"
 	shift 3
-
+	if [ -n "${QA_INTERCEPTORS}" ] ; then
+		# die was called from inside inherit. We need to clean up
+		# QA_INTERCEPTORS since sed is called below.
+		unset -f ${QA_INTERCEPTORS}
+		unset QA_INTERCEPTORS
+	fi
 	local n filespacing=0 linespacing=0
 	# setup spacing to make output easier to read
 	for ((n = ${#FUNCNAME[@]} - 1; n >= 0; --n)); do