From 3d581fcfd79a385abfd6dbe1ef54b749d58e3597 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 23 Nov 2008 21:09:52 +0000
Subject: Fix SIGINT and SIGTERM trap handling so the temp dir always cleaned
 up when killed. (trunk r12055)

svn path=/main/branches/2.1.6/; revision=12056
---
 bin/etc-update | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'bin/etc-update')

diff --git a/bin/etc-update b/bin/etc-update
index af200f6b4..35456525d 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -446,10 +446,9 @@ Please select from the menu above (-1 to exit, losing this merge): "
 }
 
 die() {
-	trap "" TERM
-	trap "" KILL
+	trap SIGTERM SIGINT
 
-	if [ ${2} -eq 0 ]; then
+	if [ "$2" -eq 0 ]; then
 		echo "Exiting: ${1}"
 		scan > /dev/null
 		[ ${count} -gt 0 ] && echo "NOTE: ${count} updates remaining"
@@ -500,7 +499,8 @@ eval $(portageq envvar -v CONFIG_PROTECT \
 export PORTAGE_TMPDIR
 
 TMP="${PORTAGE_TMPDIR}/etc-update-$$"
-trap die term
+trap "die terminated 1" SIGTERM
+trap "die interrupted 1" SIGINT
 
 [ -w ${PORTAGE_CONFIGROOT}etc ] || die "Need write access to ${PORTAGE_CONFIGROOT}etc" 1
 #echo $PORTAGE_TMPDIR
-- 
cgit v1.2.3-1-g7c22