From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 11 Nov 2007 22:17:05 +0000 (-0000)
Subject: Make diefunc() clean up QA_INTERCEPTORS in case it is
X-Git-Tag: v2.2_pre1~402
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=11890e7047b42c3be6a9b2e88974fc6f16f58130;p=portage.git

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

svn path=/main/trunk/; revision=8490
---

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index f471f8cae..b46f50a4d 100755
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -41,7 +41,12 @@ dump_trace() {
 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