From: Brian Harring <ferringb@gentoo.org>
Date: Tue, 11 Oct 2005 07:34:56 +0000 (-0000)
Subject: reset EBUILD_DEATH_HOOKS prior to sourcing, due to stable's re-sourcing of ebuild... 
X-Git-Tag: v2.0.53_rc5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ea14cf1e1538662c000a6bc4137725a9f4aa562e;p=portage.git

reset EBUILD_DEATH_HOOKS prior to sourcing, due to stable's re-sourcing of ebuild every run.
god stable env handling sucks. :/

svn path=/main/branches/2.0/; revision=2122
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 2a9b9d4b0..6cf401493 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1769,6 +1769,11 @@ if hasq "depend" "$@"; then
 	done
 	unset src bin_path body
 fi
+
+# reset the EBUILD_DEATH_HOOKS so they don't multiple due to stable's re-sourcing of env.
+# this can be left out of ebd variants, since they're unaffected.
+unset EBUILD_DEATH_HOOKS
+
 source ${EBUILD} || die "error sourcing ebuild"
 if ! hasq depend $EBUILD_PHASE; then
 	RESTRICT="${PORTAGE_RESTRICT}"