Align with zmedico

svn path=/main/branches/prefix/; revision=7889

diff --git a/bin/etc-update b/bin/etc-update
index 3df45a62b725389e5378b79cdcdbab600de8c01c..d39052d6b3fdd681f645cd8233a7f701e6367501 100755 (executable)
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -456,8 +456,6 @@ function die() {
 #
 scriptname=$(basename $0)
 
-trap die term
-
 type portageq > /dev/null || exit $?
 eval $(portageq envvar -v CONFIG_PROTECT \
        CONFIG_PROTECT_MASK PORTAGE_CONFIGROOT PORTAGE_TMPDIR ROOT USERLAND EPREFIX)
@@ -465,6 +463,7 @@ export PORTAGE_TMPDIR
 export EROOT=${ROOT%/}${EPREFIX}/
 
 TMP="${PORTAGE_TMPDIR}/etc-update-$$"
+trap die term
 
 # quick hack to get prefix support in
 PORTAGE_CONFIGROOT=${PORTAGE_CONFIGROOT}${EPREFIX}/