| 1 |
Author: zmedico |
| 2 |
Date: 2008-02-10 07:18:58 +0000 (Sun, 10 Feb 2008) |
| 3 |
New Revision: 9327 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/ebuild.sh |
| 7 |
main/trunk/bin/isolated-functions.sh |
| 8 |
Log: |
| 9 |
Remove the killparent() function and associated SIGINT trap since this |
| 10 |
should already be handled on the python side and it won't work with |
| 11 |
dropped privileges anyway. |
| 12 |
|
| 13 |
|
| 14 |
Modified: main/trunk/bin/ebuild.sh |
| 15 |
=================================================================== |
| 16 |
--- main/trunk/bin/ebuild.sh 2008-02-10 05:33:52 UTC (rev 9326) |
| 17 |
+++ main/trunk/bin/ebuild.sh 2008-02-10 07:18:58 UTC (rev 9327) |
| 18 |
@@ -1565,14 +1565,6 @@ |
| 19 |
# source ${X} || die "Failed to source ${X}" |
| 20 |
# done |
| 21 |
|
| 22 |
-else |
| 23 |
- |
| 24 |
-killparent() { |
| 25 |
- trap INT |
| 26 |
- kill ${PORTAGE_MASTER_PID} |
| 27 |
-} |
| 28 |
-trap "killparent" INT |
| 29 |
- |
| 30 |
fi # "$*"!="depend" && "$*"!="clean" && "$*" != "setup" |
| 31 |
|
| 32 |
export SANDBOX_ON="1" |
| 33 |
|
| 34 |
Modified: main/trunk/bin/isolated-functions.sh |
| 35 |
=================================================================== |
| 36 |
--- main/trunk/bin/isolated-functions.sh 2008-02-10 05:33:52 UTC (rev 9326) |
| 37 |
+++ main/trunk/bin/isolated-functions.sh 2008-02-10 07:18:58 UTC (rev 9327) |
| 38 |
@@ -452,7 +452,7 @@ |
| 39 |
abort_test abort_install dyn_compile dyn_test dyn_install \ |
| 40 |
dyn_preinst dyn_help debug-print debug-print-function \ |
| 41 |
debug-print-section inherit EXPORT_FUNCTIONS newdepend newrdepend \ |
| 42 |
- newpdepend do_newdepend remove_path_entry killparent \ |
| 43 |
+ newpdepend do_newdepend remove_path_entry \ |
| 44 |
save_ebuild_env filter_readonly_variables preprocess_ebuild_env \ |
| 45 |
source_all_bashrcs ebuild_phase ebuild_phase_with_hooks \ |
| 46 |
${QA_INTERCEPTORS} |
| 47 |
|
| 48 |
-- |
| 49 |
gentoo-commits@l.g.o mailing list |
Archives