diff options
author | Zac Medico <zmedico@gentoo.org> | 2006-06-23 09:52:30 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2006-06-23 09:52:30 +0000 |
commit | 75784ffb415bd299009cb553b76ec0381b32a3a0 (patch) | |
tree | 9f38a53bfcebfb318ddd28ff91c31419cadb23b1 | |
parent | ef54b1f4f6d0b14ceb624be0b953950fddc4e299 (diff) | |
download | portage-75784ffb415bd299009cb553b76ec0381b32a3a0.tar.gz portage-75784ffb415bd299009cb553b76ec0381b32a3a0.tar.bz2 portage-75784ffb415bd299009cb553b76ec0381b32a3a0.zip |
Ensure that ^C interrupts are handled quietly.
svn path=/main/trunk/; revision=3625
-rwxr-xr-x | bin/emerge | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/bin/emerge b/bin/emerge index 319649ce8..a9ef2e656 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3,15 +3,27 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# 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 os,sys os.environ["PORTAGE_CALLER"]="emerge" sys.path = ["/usr/lib/portage/pym"]+sys.path import errno -try: - import portage -except KeyboardInterrupt: - sys.exit(1) # If they control C during imports, just die silently +import portage import emergehelp, xpak, commands, re, signal, socket, string, time, types from stat import ST_MTIME |