From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 29 Sep 2007 21:12:51 +0000 (-0000)
Subject: Align with zmedico
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=301a616aa7b9e4713ad7ca93c4be7ad648777be7;p=portage.git

Align with zmedico

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

diff --git a/bin/etc-update b/bin/etc-update
index 3df45a62b..d39052d6b 100755
--- 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}/