From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 30 Dec 2006 10:32:03 +0000 (-0000)
Subject: Punt the abort_unpack() handler since it's pointless anyway.
X-Git-Tag: v2.1.2~187
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0d55b39ea89067117377e2fd66a5e16609a25199;p=portage.git

Punt the abort_unpack() handler since it's pointless anyway.

svn path=/main/trunk/; revision=5425
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 3e793a6ec..18409bd03 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -684,7 +684,6 @@ dyn_setup() {
 }
 
 dyn_unpack() {
-	trap "abort_unpack" SIGINT SIGQUIT
 	[ "$(type -t pre_src_unpack)" == "function" ] && pre_src_unpack
 	local newstuff="no"
 	if [ -e "${WORKDIR}" ]; then
@@ -735,8 +734,6 @@ dyn_unpack() {
 	cd "${PORTAGE_BUILDDIR}"
 
 	[ "$(type -t post_src_unpack)" == "function" ] && post_src_unpack
-
-	trap SIGINT SIGQUIT
 }
 
 dyn_clean() {
@@ -874,13 +871,6 @@ abort_compile() {
 	exit 1
 }
 
-abort_unpack() {
-	abort_handler "src_unpack" $1
-	rm -f "${PORTAGE_BUILDDIR}/.unpacked"
-	rm -rf "${PORTAGE_BUILDDIR}/work"
-	exit 1
-}
-
 abort_test() {
 	abort_handler "dyn_test" $1
 	rm -f "${PORTAGE_BUILDDIR}/.tested"