Move initial signal handlers to the launcher script.

svn path=/main/trunk/; revision=12290

1 files changed, 17 insertions, 0 deletions

diff --git a/bin/emerge b/bin/emerge
index 1ef575e13..40e3b19f0 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -3,6 +3,23 @@
 # Portage Emerge bits
 # $Id$
 
+import sys
+# This block ensures that ^C interrupts are handled quietly.
+try:
+	import signal
+
+	def exithandler(signum,frame):
+		signal.signal(signal.SIGINT, signal.SIG_IGN)
+		signal.signal(signal.SIGTERM, signal.SIG_IGN)
+		sys.exit(1)
+
+	signal.signal(signal.SIGINT, exithandler)
+	signal.signal(signal.SIGTERM, exithandler)
+	signal.signal(signal.SIGPIPE, signal.SIG_DFL)
+
+except KeyboardInterrupt:
+	sys.exit(1)
+
 try:
 	import _emerge
 except ImportError: