Better detection of KeyboardInterrupts. (Christoph Wiedemann)

7 files changed, 17 insertions, 5 deletions

diff --git a/src/engine/SCons/Tool/hpc++.py b/src/engine/SCons/Tool/hpc++.py
index 5b650d6..a38d494 100644
--- a/src/engine/SCons/Tool/hpc++.py
+++ b/src/engine/SCons/Tool/hpc++.py
@@ -44,7 +44,7 @@ acc = None
 
 try:
     dirs = os.listdir('/opt')
-except:
+except OSError:
     dirs = []
 
 for dir in dirs:
diff --git a/src/engine/SCons/Tool/hplink.py b/src/engine/SCons/Tool/hplink.py
index 7468920..2c7b55c 100644
--- a/src/engine/SCons/Tool/hplink.py
+++ b/src/engine/SCons/Tool/hplink.py
@@ -43,7 +43,7 @@ ccLinker = None
 
 try:
     dirs = os.listdir('/opt')
-except:
+except OSError:
     dirs = []
 
 for dir in dirs:
diff --git a/src/engine/SCons/Tool/javah.py b/src/engine/SCons/Tool/javah.py
index ccb62f2..93678e4 100644
--- a/src/engine/SCons/Tool/javah.py
+++ b/src/engine/SCons/Tool/javah.py
@@ -55,7 +55,7 @@ def emit_java_headers(target, source, env):
         else:
             try:
                 classdir = s.attributes.java_classdir
-            except:
+            except AttributeError:
                 classdir = '.'
     classdir = SCons.Node.FS.default_fs.Dir(classdir).rdir()
     if str(classdir) == '.':
diff --git a/src/engine/SCons/Tool/msvc.py b/src/engine/SCons/Tool/msvc.py
index db434c4..4b15568 100644
--- a/src/engine/SCons/Tool/msvc.py
+++ b/src/engine/SCons/Tool/msvc.py
@@ -301,6 +301,8 @@ def get_msvc_default_paths(version = None):
     try:
         if not version:
             version = SCons.Tool.msvs.get_visualstudio_versions()[0] #use highest version
+    except KeyboardInterrupt:
+        raise
     except:
         pass
 
diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py
index d4c32ba..68e8fda 100644
--- a/src/engine/SCons/Tool/msvs.py
+++ b/src/engine/SCons/Tool/msvs.py
@@ -317,6 +317,8 @@ class _GenerateV6DSP(_DSPGenerator):
         try:
             datas = base64.decodestring(datas)
             data = pickle.loads(datas)
+        except KeyboardInterrupt:
+            raise
         except:
             return # unable to unpickle any data for some reason
 
@@ -334,6 +336,8 @@ class _GenerateV6DSP(_DSPGenerator):
         try:
             datas = base64.decodestring(datas)
             data = pickle.loads(datas)
+        except KeyboardInterrupt:
+            raise
         except:
             return # unable to unpickle any data for some reason
 
@@ -474,6 +478,8 @@ class _GenerateV7DSP(_DSPGenerator):
         try:
             datas = base64.decodestring(datas)
             data = pickle.loads(datas)
+        except KeyboardInterrupt:
+            raise
         except:
             return # unable to unpickle any data for some reason
 
@@ -490,6 +496,8 @@ class _GenerateV7DSP(_DSPGenerator):
         try:
             datas = base64.decodestring(datas)
             data = pickle.loads(datas)
+        except KeyboardInterrupt:
+            raise
         except:
             return # unable to unpickle any data for some reason
 
@@ -567,6 +575,8 @@ class _GenerateV7DSW(_DSWGenerator):
         try:
             datas = base64.decodestring(datas)
             data = pickle.loads(datas)
+        except KeyboardInterrupt:
+            raise
         except:
             return # unable to unpickle any data for some reason
 
diff --git a/src/engine/SCons/Tool/rmic.py b/src/engine/SCons/Tool/rmic.py
index 7043566..79cc316 100644
--- a/src/engine/SCons/Tool/rmic.py
+++ b/src/engine/SCons/Tool/rmic.py
@@ -55,7 +55,7 @@ def emit_rmic_classes(target, source, env):
         else:
             try:
                 classdir = s.attributes.java_classdir
-            except:
+            except AttributeError:
                 classdir = '.'
     classdir = SCons.Node.FS.default_fs.Dir(classdir).rdir()
     if str(classdir) == '.':
diff --git a/src/engine/SCons/Tool/sunlink.py b/src/engine/SCons/Tool/sunlink.py
index f23917b..53dd410 100644
--- a/src/engine/SCons/Tool/sunlink.py
+++ b/src/engine/SCons/Tool/sunlink.py
@@ -43,7 +43,7 @@ ccLinker = None
 
 try:
     dirs = os.listdir('/opt')
-except:
+except OSError:
     dirs = []
 
 for dir in dirs: