From f707221b69ed913b7a1cb66c7ab45be2d1586f7c Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 15 Jan 2011 19:43:35 -0800 Subject: Tweak PollScheduler signal handling. --- pym/_emerge/Scheduler.py | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) (limited to 'pym/_emerge/Scheduler.py') diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index ac48f853e..463d0d85e 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -7,6 +7,7 @@ import gc import gzip import logging import shutil +import signal import sys import tempfile import textwrap @@ -1166,10 +1167,35 @@ class Scheduler(PollScheduler): return rval while True: - rval = self._merge() - if self._terminated.is_set(): - return 1 + received_signal = [] + + def sighandler(signum, frame): + signal.signal(signal.SIGINT, signal.SIG_IGN) + signal.signal(signal.SIGTERM, signal.SIG_IGN) + portage.util.writemsg("\n\nExiting on signal %(signal)s\n" % \ + {"signal":signum}) + self.terminate() + received_signal.append(128 + signum) + + earlier_sigint_handler = signal.signal(signal.SIGINT, sighandler) + earlier_sigterm_handler = signal.signal(signal.SIGTERM, sighandler) + + try: + rval = self._merge() + finally: + # Restore previous handlers + if earlier_sigint_handler is not None: + signal.signal(signal.SIGINT, earlier_sigint_handler) + else: + signal.signal(signal.SIGINT, signal.SIG_DFL) + if earlier_sigterm_handler is not None: + signal.signal(signal.SIGTERM, earlier_sigterm_handler) + else: + signal.signal(signal.SIGTERM, signal.SIG_DFL) + + if received_signal: + sys.exit(received_signal[0]) if rval == os.EX_OK or fetchonly or not keep_going: break -- cgit v1.2.3-1-g7c22