summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-01-31 20:33:48 -0800
committerZac Medico <zmedico@gentoo.org>2011-01-31 20:33:48 -0800
commit23cc6611c8b5303ec2ecf8cb8203e69ddb825551 (patch)
treee52a71f8e0671b346d44c222d36040c59ef6933f
parent1989cc809b67b8f847d58c096fb70fe89a961a3e (diff)
downloadportage-23cc6611c8b5303ec2ecf8cb8203e69ddb825551.tar.gz
portage-23cc6611c8b5303ec2ecf8cb8203e69ddb825551.tar.bz2
portage-23cc6611c8b5303ec2ecf8cb8203e69ddb825551.zip
EbuildFetcher: use default SIGINT/TERM handlers
This seems to fix bug #353239.
-rw-r--r--pym/_emerge/EbuildFetcher.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/pym/_emerge/EbuildFetcher.py b/pym/_emerge/EbuildFetcher.py
index 59076a8db..0ea8dc775 100644
--- a/pym/_emerge/EbuildFetcher.py
+++ b/pym/_emerge/EbuildFetcher.py
@@ -5,6 +5,7 @@ import traceback
from _emerge.SpawnProcess import SpawnProcess
import copy
+import signal
import sys
import portage
from portage import os
@@ -95,6 +96,11 @@ class EbuildFetcher(SpawnProcess):
portage.process._setup_pipes(fd_pipes)
+ # Use default signal handlers in order to avoid problems
+ # killing subprocesses as reported in bug #353239.
+ signal.signal(signal.SIGINT, signal.SIG_DFL)
+ signal.signal(signal.SIGTERM, signal.SIG_DFL)
+
# Force consistent color output, in case we are capturing fetch
# output through a normal pipe due to unavailability of ptys.
portage.output.havecolor = self._settings.get('NOCOLOR') \