[gentoo-commits] portage r11268 - main/trunk/bin

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-07-29 18:31:19 +0000 (Tue, 29 Jul 2008)
New Revision: 11268

Modified:
   main/trunk/bin/ebuild
Log:
Add a quiet signal handler for SIGINT and SIGTERM since emerge calls ebuild
for fetchs and we don't want the user to see a traceback due to the ebuild
process getting killed.


Modified: main/trunk/bin/ebuild
===================================================================
--- main/trunk/bin/ebuild	2008-07-29 17:50:36 UTC (rev 11267)
+++ main/trunk/bin/ebuild	2008-07-29 18:31:19 UTC (rev 11268)
@@ -3,9 +3,24 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-src/portage/bin/ebuild,v 1.18.2.3 2005/05/07 04:32:59 ferringb Exp $
 
+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)
+
+except KeyboardInterrupt:
+	sys.exit(1)
+
 import optparse
 import os
-import sys
 
 description = "See the ebuild(1) man page for more info"
 usage = "Usage: ebuild <ebuild file> <command> [command] ..."