From: Alec Warner <antarus@gentoo.org>
Date: Tue, 14 Mar 2006 16:18:27 +0000 (-0000)
Subject: Catch keyboardinterrupt during imports, don't print nasty tracebacks there, later... 
X-Git-Tag: v2.1_pre7~87
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7d4ba69fa0e1cfb0f8b63e537ec9f72dfbfdc7f9;p=portage.git

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
---

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 *