From 441e03a5e41c7948f8978bc45fc6ca8e52d493ed Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 3 Apr 2017 20:33:51 -0400 Subject: py2/3 more work on getting exception handling to work properly on both py2/3 --- src/engine/SCons/Taskmaster.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v0.12