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)

svn path=/main/branches/2.1.2/; revision=9581

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index b9abc47900c829a817b3ac722eaa44fec6ab41b6..8f22fcab3b676d4078c1264e1d4c874209db5a3e 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1563,14 +1563,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 2485012119b74862ba8e135049f235f10d50ceb2..08d1fcb0e7871f94fc7c4a6f6843956dbaedb80d 100644 (file)
--- 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}