Better detection of KeyboardInterrupts. (Christoph Wiedemann)

2 files changed, 4 insertions, 2 deletions

diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py
index 8212061..4c47078 100644
--- a/src/engine/SCons/Script/SConscript.py
+++ b/src/engine/SCons/Script/SConscript.py
@@ -80,7 +80,7 @@ def get_calling_namespaces():
     """Return the locals and globals for the function that called
     into this module in the current callstack."""
     try: 1/0
-    except: frame = sys.exc_info()[2].tb_frame
+    except ZeroDivisionError: frame = sys.exc_info()[2].tb_frame
     
     while frame.f_globals.get("__name__") == __name__: frame = frame.f_back
 
diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py
index 613f775..03cb6d8 100644
--- a/src/engine/SCons/Script/__init__.py
+++ b/src/engine/SCons/Script/__init__.py
@@ -422,6 +422,8 @@ class OptParser(OptionParser):
                                                                   __main__.__date__,
                                                                   __main__.__developer__,
                                                                   __main__.__buildsys__))
+        except KeyboardInterrupt:
+            raise
         except:
             # On win32 there is no scons.py, so there is no __main__.__version__,
             # hence there is no script version.
@@ -740,7 +742,7 @@ def _main(args, parser):
         cdir = _create_path(options.directory)
         try:
             os.chdir(cdir)
-        except:
+        except OSError:
             sys.stderr.write("Could not change directory to %s\n" % cdir)
 
     xmit_args = []