diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-02-10 07:18:58 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-02-10 07:18:58 +0000 |
| commit | 5a1c8aa2d7cd79170aab7c0be84bd3a1938d4d22 (patch) | |
| tree | 1f651226b774224e116f29e8df42e9708eec0c73 /bin | |
| parent | be06833cb95c312db84a220439eb3c84cdd23154 (diff) | |
| download | portage-5a1c8aa2d7cd79170aab7c0be84bd3a1938d4d22.tar.gz portage-5a1c8aa2d7cd79170aab7c0be84bd3a1938d4d22.tar.bz2 portage-5a1c8aa2d7cd79170aab7c0be84bd3a1938d4d22.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.
svn path=/main/trunk/; revision=9327
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ebuild.sh | 8 | ||||
| -rwxr-xr-x | bin/isolated-functions.sh | 2 |
2 files changed, 1 insertions, 9 deletions
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} |