Tweak PollScheduler signal handling.

1 files changed, 7 insertions, 3 deletions

diff --git a/bin/egencache b/bin/egencache
index bf729c380..76dd900e7 100755
--- a/bin/egencache
+++ b/bin/egencache
@@ -272,15 +272,19 @@ class GenCache(object):
 
 		try:
 			self._regen.run()
-
-			if received_signal:
-				sys.exit(received_signal[0])
 		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])
 
 		self.returncode |= self._regen.returncode
 		cp_missing = self._cp_missing