[gentoo-commits] portage r12319 - in main/branches/2.1.6: bin pym/_emerge

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-12-25 01:22:57 +0000 (Thu, 25 Dec 2008)
New Revision: 12319

Modified:
   main/branches/2.1.6/bin/emerge
   main/branches/2.1.6/pym/_emerge/__init__.py
Log:
Move initial signal handlers to the launcher script. (trunk r12290)

Modified: main/branches/2.1.6/bin/emerge
===================================================================
--- main/branches/2.1.6/bin/emerge	2008-12-25 01:22:38 UTC (rev 12318)
+++ main/branches/2.1.6/bin/emerge	2008-12-25 01:22:57 UTC (rev 12319)
@@ -3,7 +3,24 @@
 # 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:
 	from os import path as osp

Modified: main/branches/2.1.6/pym/_emerge/__init__.py
===================================================================
--- main/branches/2.1.6/pym/_emerge/__init__.py	2008-12-25 01:22:38 UTC (rev 12318)
+++ main/branches/2.1.6/pym/_emerge/__init__.py	2008-12-25 01:22:57 UTC (rev 12319)
@@ -3,23 +3,6 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: emerge 5976 2007-02-17 09:14:53Z genone $
 
-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)
-
 import array
 from collections import deque
 import fcntl
@@ -28,6 +11,8 @@
 import select
 import shlex
 import shutil
+import signal
+import sys
 import textwrap
 import urlparse
 import weakref