summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-09-24 21:20:34 +0000
committerZac Medico <zmedico@gentoo.org>2007-09-24 21:20:34 +0000
commite3da72ad6ef75d2a0bc4ea2c3b9c3a5b901e239a (patch)
tree91727e1d372ba557f52664fc3bd031211c0ba1e2
parent32fc2c1d0ba5ad8ef1f223c1ae8a985d3dcdc8cf (diff)
downloadportage-e3da72ad6ef75d2a0bc4ea2c3b9c3a5b901e239a.tar.gz
portage-e3da72ad6ef75d2a0bc4ea2c3b9c3a5b901e239a.tar.bz2
portage-e3da72ad6ef75d2a0bc4ea2c3b9c3a5b901e239a.zip
Initialize ${TMP} before registering the die trap so that
we're sure which directory die will clean up. svn path=/main/trunk/; revision=7802
-rwxr-xr-xbin/etc-update2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/etc-update b/bin/etc-update
index 268185676..3ca5a52b1 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -456,6 +456,7 @@ function die() {
#
scriptname=$(basename $0)
+TMP="${PORTAGE_TMPDIR}/etc-update-$$"
trap die term
type portageq > /dev/null || exit $?
@@ -469,7 +470,6 @@ export PORTAGE_TMPDIR
#echo $CONFIG_PROTECT_MASK
#export PORTAGE_TMPDIR=$(/usr/lib/portage/bin/portageq envvar PORTAGE_TMPDIR)
-TMP="${PORTAGE_TMPDIR}/etc-update-$$"
rm -rf "${TMP}" 2> /dev/null
mkdir "${TMP}" || die "failed to create temp dir" 1
# make sure we have a secure directory to work in