diff options
| author | Steven Knight <knight@baldmt.com> | 2009-04-30 15:27:04 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2009-04-30 15:27:04 (GMT) |
| commit | ba4fc5a2d238127e04548a1e9f1f3c210b6d1a36 (patch) | |
| tree | 20d784cb656b7a95c078869b70393efbe73ea92e /src | |
| parent | fc0796034248d84fa541c1a2d7b2e3eda1a26872 (diff) | |
| download | SCons-ba4fc5a2d238127e04548a1e9f1f3c210b6d1a36.zip SCons-ba4fc5a2d238127e04548a1e9f1f3c210b6d1a36.tar.gz SCons-ba4fc5a2d238127e04548a1e9f1f3c210b6d1a36.tar.bz2 | |
Avoid swallowing KeyboardInterrupt in new try:-except: blocks.
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Script/Main.py | 4 |
1 files changed, 4 insertions, 0 deletions
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)) |