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

svn path=/main/trunk/; revision=14932

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 1a1f3e1039bb08b6f3b663614140a79cd43a3df1..3a203860dae6787287424338b80cfc1e2521cc7d 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -260,7 +260,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