From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 10 Feb 2008 07:18:58 +0000 (-0000)
Subject: Remove the killparent() function and associated SIGINT trap since this
X-Git-Tag: v2.2_pre2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5a1c8aa2d7cd79170aab7c0be84bd3a1938d4d22;p=portage.git

Remove the killparent() function and associated SIGINT trap since this
should already be handled on the python side and it won't work with
dropped privileges anyway.

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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 61f6e18fe..0c9a6760a 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1565,14 +1565,6 @@ if [ -n "${EBUILD_SH_ARGS}" ] && \
 #		source ${X} || die "Failed to source ${X}"
 #	done
 
-else
-
-killparent() {
-	trap INT
-	kill ${PORTAGE_MASTER_PID}
-}
-trap "killparent" INT
-
 fi # "$*"!="depend" && "$*"!="clean" && "$*" != "setup"
 
 export SANDBOX_ON="1"
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index ee73e7bcd..d44cbbc6d 100755
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -452,7 +452,7 @@ save_ebuild_env() {
 			abort_test abort_install dyn_compile dyn_test dyn_install \
 			dyn_preinst dyn_help debug-print debug-print-function \
 			debug-print-section inherit EXPORT_FUNCTIONS newdepend newrdepend \
-			newpdepend do_newdepend remove_path_entry killparent \
+			newpdepend do_newdepend remove_path_entry \
 			save_ebuild_env filter_readonly_variables preprocess_ebuild_env \
 			source_all_bashrcs ebuild_phase ebuild_phase_with_hooks \
 			${QA_INTERCEPTORS}