diff options
| -rwxr-xr-x | bin/emerge | 17 | ||||
| -rw-r--r-- | pym/_emerge/__init__.py | 19 |
2 files changed, 19 insertions, 17 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: diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index acca12ace..31e669aae 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -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 logging import select import shlex import shutil +import signal +import sys import textwrap import urlparse import weakref |