From e2a3237b4018e274350488868577c4d74a496b85 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 15 Jan 2011 13:22:15 -0800 Subject: When killed by signal, return 128 + signum. This is the same convention that bash uses for returncodes of processes that are killed by signals. --- bin/emerge | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bin/emerge') 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 -- cgit v1.2.3-1-g7c22