summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2017-04-04 00:33:51 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2017-04-04 00:33:51 (GMT)
commit441e03a5e41c7948f8978bc45fc6ca8e52d493ed (patch)
tree69e69f936ab96e9753cf71cab642c09648c9364e
parent11e9e1615ceeb6a2ca8d3463b94df84a6fca6ac5 (diff)
downloadSCons-441e03a5e41c7948f8978bc45fc6ca8e52d493ed.zip
SCons-441e03a5e41c7948f8978bc45fc6ca8e52d493ed.tar.gz
SCons-441e03a5e41c7948f8978bc45fc6ca8e52d493ed.tar.bz2
py2/3 more work on getting exception handling to work properly on both py2/3
-rw-r--r--src/engine/SCons/Taskmaster.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/engine/SCons/Taskmaster.py b/src/engine/SCons/Taskmaster.py
index c44ccee..ec7b9f2 100644
--- a/src/engine/SCons/Taskmaster.py
+++ b/src/engine/SCons/Taskmaster.py
@@ -542,6 +542,7 @@ class Task(object):
exc_type, exc_value = exc
exc_traceback = None
+ # raise exc_type(exc_value).with_traceback(exc_traceback)
if sys.version_info[0] == 2:
exec("raise exc_type, exc_value, exc_traceback")
else: # sys.version_info[0] == 3:
@@ -960,7 +961,7 @@ class Taskmaster(object):
task = self.tasker(self, tlist, node in self.original_top, node)
try:
task.make_ready()
- except:
+ except Exception as e :
# We had a problem just trying to get this task ready (like
# a child couldn't be linked to a VariantDir when deciding
# whether this node is current). Arrange to raise the