Catch keyboardinterrupt during imports, don't print nasty tracebacks there, later...

svn path=/main/trunk/; revision=2885

diff --git a/bin/emerge b/bin/emerge
index c562fd1c1118e15728ed7e92c4c66ad3bd931beb..903e017e9ce6fb86acec042d9e0a10aa62f4e026 100755 (executable)
--- 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 *