Avoid swallowing KeyboardInterrupt in new try:-except: blocks.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@4165 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py
index a8ec8f6eba96b0e12631cb312f946b0c32fd21d4..44ca8772367b3a2e03c16df2ebd43450cb99cc5e 100644 (file)
--- 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))