diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-01-31 20:42:46 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-02-02 15:27:37 -0800 |
| commit | 8b28661fa553598acb4f08c362b046fabb8fac5c (patch) | |
| tree | 83440d6d76b7b28c0a31548de8badc8d601d2121 /pym | |
| parent | f5c551e10d28855266f8e5d6beccf8a52d2e8417 (diff) | |
| download | portage-8b28661fa553598acb4f08c362b046fabb8fac5c.tar.gz portage-8b28661fa553598acb4f08c362b046fabb8fac5c.tar.bz2 portage-8b28661fa553598acb4f08c362b046fabb8fac5c.zip | |
_MergeProcess: use default SIGINT/TERM handlers
Signal handlers inherited from the parent process are irrelevant here.
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/dbapi/_MergeProcess.py | 8 |
1 files changed, 7 insertions, 1 deletions
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') |