From c04225dddbe83ba371258ffdc4be7842ab672fff Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 31 Jan 2011 20:42:46 -0800 Subject: _MergeProcess: use default SIGINT/TERM handlers Signal handlers inherited from the parent process are irrelevant here. --- pym/portage/dbapi/_MergeProcess.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'pym') diff --git a/pym/portage/dbapi/_MergeProcess.py b/pym/portage/dbapi/_MergeProcess.py index 3cf50d22b..f717d12df 100644 --- a/pym/portage/dbapi/_MergeProcess.py +++ b/pym/portage/dbapi/_MergeProcess.py @@ -1,6 +1,7 @@ -# Copyright 2010 Gentoo Foundation +# Copyright 2010-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +import signal import traceback import portage @@ -29,6 +30,11 @@ class MergeProcess(SpawnProcess): portage.process._setup_pipes(fd_pipes) + # Use default signal handlers since the ones inherited + # from the parent process are irrelevant here. + signal.signal(signal.SIGINT, signal.SIG_DFL) + signal.signal(signal.SIGTERM, signal.SIG_DFL) + portage.output.havecolor = self.dblink.settings.get('NOCOLOR') \ not in ('yes', 'true') -- cgit v1.2.3-1-g7c22