Fix configure logic calling configured decider not handling DeciderNe…

…edsNode exception which can be thrown by MD5-Timestamp decider logic
SCons · Feb 2, 2019 · 533bef1 · 533bef1
1 parent 48a7fdd
commit 533bef1
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/engine/SCons/SConf.py b/src/engine/SCons/SConf.py
@@ -56,6 +56,7 @@
 import SCons.Conftest
 
 from SCons.Debug import Trace
+from SCons.Node import DeciderNeedsNode
 
 # Turn off the Conftest error logging
 SCons.Conftest.LogInputFiles = 0
@@ -330,8 +331,14 @@ def execute(self):
                     # that the correct .sconsign info will get calculated
                     # and keep the build state consistent.
                     def force_build(dependency, target, prev_ni,
-                                    env_decider=env.decide_source):
-                        env_decider(dependency, target, prev_ni)
+                                    env_decider=env.decide_source,
+                                    node=None):
+                        try:
+                            env_decider(dependency, target, prev_ni)
+                        except DeciderNeedsNode as e:
+                            e.decider(target, prev_ni, node=target)
+                        except Exception as e:
+                            raise e
                         return True
                     if env.decide_source.__code__ is not force_build.__code__:
                         env.Decider(force_build)