From ba4fc5a2d238127e04548a1e9f1f3c210b6d1a36 Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Thu, 30 Apr 2009 15:27:04 +0000 Subject: Avoid swallowing KeyboardInterrupt in new try:-except: blocks. --- src/engine/SCons/Script/Main.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py index a8ec8f6..44ca877 100644 --- a/src/engine/SCons/Script/Main.py +++ b/src/engine/SCons/Script/Main.py @@ -718,10 +718,14 @@ def _load_site_scons_dir(topdir, site_dir_name=None): try: # This is the magic. exec fp in m.__dict__ + except KeyboardInterrupt: + raise except Exception, e: fmt = '*** Error loading site_init file %s:\n' sys.stderr.write(fmt % repr(site_init_file)) raise + except KeyboardInterrupt: + raise except ImportError, e: fmt = '*** cannot import site init file %s:\n' sys.stderr.write(fmt % repr(site_init_file)) -- cgit v0.12