| 1 |
commit: 23cc6611c8b5303ec2ecf8cb8203e69ddb825551 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 1 04:33:48 2011 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 1 04:33:48 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=23cc6611 |
| 7 |
|
| 8 |
EbuildFetcher: use default SIGINT/TERM handlers |
| 9 |
|
| 10 |
This seems to fix bug #353239. |
| 11 |
|
| 12 |
--- |
| 13 |
pym/_emerge/EbuildFetcher.py | 6 ++++++ |
| 14 |
1 files changed, 6 insertions(+), 0 deletions(-) |
| 15 |
|
| 16 |
diff --git a/pym/_emerge/EbuildFetcher.py b/pym/_emerge/EbuildFetcher.py |
| 17 |
index 59076a8..0ea8dc7 100644 |
| 18 |
--- a/pym/_emerge/EbuildFetcher.py |
| 19 |
+++ b/pym/_emerge/EbuildFetcher.py |
| 20 |
@@ -5,6 +5,7 @@ import traceback |
| 21 |
|
| 22 |
from _emerge.SpawnProcess import SpawnProcess |
| 23 |
import copy |
| 24 |
+import signal |
| 25 |
import sys |
| 26 |
import portage |
| 27 |
from portage import os |
| 28 |
@@ -95,6 +96,11 @@ class EbuildFetcher(SpawnProcess): |
| 29 |
|
| 30 |
portage.process._setup_pipes(fd_pipes) |
| 31 |
|
| 32 |
+ # Use default signal handlers in order to avoid problems |
| 33 |
+ # killing subprocesses as reported in bug #353239. |
| 34 |
+ signal.signal(signal.SIGINT, signal.SIG_DFL) |
| 35 |
+ signal.signal(signal.SIGTERM, signal.SIG_DFL) |
| 36 |
+ |
| 37 |
# Force consistent color output, in case we are capturing fetch |
| 38 |
# output through a normal pipe due to unavailability of ptys. |
| 39 |
portage.output.havecolor = self._settings.get('NOCOLOR') \ |
Archives