When killed by signal, return 128 + signum.

This is the same convention that bash uses for returncodes of
processes that are killed by signals.

1 files changed, 4 insertions, 4 deletions

diff --git a/bin/emerge b/bin/emerge
index 5d74bfa00..6f69244be 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1,18 +1,18 @@
 #!/usr/bin/python
-# Copyright 2006-2009 Gentoo Foundation
+# Copyright 2006-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 from __future__ import print_function
 
+import signal
 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)
+		sys.exit(128 + signum)
 
 	signal.signal(signal.SIGINT, exithandler)
 	signal.signal(signal.SIGTERM, exithandler)
@@ -21,7 +21,7 @@ try:
 	signal.signal(signal.SIGPIPE, signal.SIG_DFL)
 
 except KeyboardInterrupt:
-	sys.exit(1)
+	sys.exit(128 + signal.SIGINT)
 
 def debug_signal(signum, frame):
 	import pdb