summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorAlec Warner <antarus@gentoo.org>2006-03-14 16:18:27 +0000
committerAlec Warner <antarus@gentoo.org>2006-03-14 16:18:27 +0000
commit7d4ba69fa0e1cfb0f8b63e537ec9f72dfbfdc7f9 (patch)
tree06e108b1356e8587a4327c365c8feed6aa8f95d0 /bin
parenta47591ec3627bf65021727d174bd2fa7d5ae7eb9 (diff)
downloadportage-7d4ba69fa0e1cfb0f8b63e537ec9f72dfbfdc7f9.tar.gz
portage-7d4ba69fa0e1cfb0f8b63e537ec9f72dfbfdc7f9.tar.bz2
portage-7d4ba69fa0e1cfb0f8b63e537ec9f72dfbfdc7f9.zip
Catch keyboardinterrupt during imports, don't print nasty tracebacks there, later on we have signal handlers for control C
svn path=/main/trunk/; revision=2885
Diffstat (limited to 'bin')
-rwxr-xr-xbin/emerge5
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge
index c562fd1c1..903e017e9 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -7,7 +7,10 @@ import os,sys
os.environ["PORTAGE_CALLER"]="emerge"
sys.path = ["/usr/lib/portage/pym"]+sys.path
-import portage
+try:
+ import portage
+except KeyboardInterrupt:
+ sys.exit(1) # If they control C during imports, just die silently
import emergehelp,xpak,string,re,commands,time,shutil,traceback,signal,socket,types
from stat import *