[gentoo-commits] portage r9581 - main/branches/2.1.2/bin

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-03-28 20:29:24 +0000 (Fri, 28 Mar 2008)
New Revision: 9581

Modified:
   main/branches/2.1.2/bin/ebuild.sh
   main/branches/2.1.2/bin/isolated-functions.sh
Log:
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. (trunk r9327)


Modified: main/branches/2.1.2/bin/ebuild.sh
===================================================================
--- main/branches/2.1.2/bin/ebuild.sh	2008-03-28 13:11:58 UTC (rev 9580)
+++ main/branches/2.1.2/bin/ebuild.sh	2008-03-28 20:29:24 UTC (rev 9581)
@@ -1563,14 +1563,6 @@
 #		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"

Modified: main/branches/2.1.2/bin/isolated-functions.sh
===================================================================
--- main/branches/2.1.2/bin/isolated-functions.sh	2008-03-28 13:11:58 UTC (rev 9580)
+++ main/branches/2.1.2/bin/isolated-functions.sh	2008-03-28 20:29:24 UTC (rev 9581)
@@ -452,7 +452,7 @@
 			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}

-- 
gentoo-commits@l.g.o mailing list