diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-03-28 20:29:24 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-03-28 20:29:24 +0000 |
| commit | 7131bb373c4991a3ea2cddf17b4bd0c465e430f3 (patch) | |
| tree | 85fc2404e6e3fe75000fc4607821e2b559ae7b3d | |
| parent | 7fe203ec1362133badf047f33652e871673f77a9 (diff) | |
| download | portage-7131bb373c4991a3ea2cddf17b4bd0c465e430f3.tar.gz portage-7131bb373c4991a3ea2cddf17b4bd0c465e430f3.tar.bz2 portage-7131bb373c4991a3ea2cddf17b4bd0c465e430f3.zip | |
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
| -rwxr-xr-x | bin/ebuild.sh | 8 | ||||
| -rw-r--r-- | bin/isolated-functions.sh | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index b9abc4790..8f22fcab3 100755 --- 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 248501211..08d1fcb0e 100644 --- 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} |