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 0e497b55dcac2315771ea078ef9c662f1e5279fc..6a32aa0cefadcac534c92412584f8c7acfe6768f 100755 (executable)
--- 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