From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 25 Aug 2011 16:37:11 +0000 (-0700)
Subject: die: defer die hooks for EAPI 4 helpers_die
X-Git-Tag: v2.2.0_alpha52~67
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5970a41fc60fef89fd4b1bbe45a6c108452b267f;p=portage.git

die: defer die hooks for EAPI 4 helpers_die

This will fix bug #380625.
---

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 65bb1d5d5..1de1f7f0d 100644
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -203,7 +203,12 @@ die() {
 		fi
 	fi
 
-	if [[ "${EBUILD_PHASE/depend}" == "${EBUILD_PHASE}" ]] ; then
+	# Only call die hooks here if we are executed via ebuild.sh or
+	# misc-functions.sh, since those are the only cases where the environment
+	# contains the hook functions. When necessary (like for helpers_die), die
+	# hooks are automatically called later by a misc-functions.sh invocation.
+	if has ${BASH_SOURCE[$main_index]##*/} ebuild.sh misc-functions.sh && \
+		[[ ${EBUILD_PHASE} != depend ]] ; then
 		local x
 		for x in $EBUILD_DEATH_HOOKS; do
 			${x} "$@" >&2 1>&2