From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 6 Dec 2009 11:01:29 +0000 (-0000)
Subject: Make register_die_hook() ensure that each hook is registered only once.
X-Git-Tag: v2.1.7.11~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7a058619e11d8544d5edc8641390ea33877fa90a;p=portage.git

Make register_die_hook() ensure that each hook is registered only once.
(trunk r14932)

svn path=/main/branches/2.1.7/; revision=14946
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 0e497b55d..6a32aa0ce 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -266,7 +266,11 @@ use_enable() {
 }
 
 register_die_hook() {
-	export EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} $*"
+	local x
+	for x in $* ; do
+		hasq $x $EBUILD_DEATH_HOOKS || \
+			export EBUILD_DEATH_HOOKS="$EBUILD_DEATH_HOOKS $x"
+	done
 }
 
 # Ensure that $PWD is sane whenever possible, to protect against