Merge branch 'feature/upstream' into develop

1 files changed, 6 insertions, 8 deletions

diff --git a/src/engine/SCons/SConf.py b/src/engine/SCons/SConf.py
index e0cd35d..7409c50 100644
--- a/src/engine/SCons/SConf.py
+++ b/src/engine/SCons/SConf.py
@@ -35,7 +35,7 @@ libraries are installed, if some command line options are supported etc.
 #
 from __future__ import print_function
 
-__revision__ = "src/engine/SCons/SConf.py 103260fce95bf5db1c35fb2371983087d85dd611 2019-07-13 18:25:30 bdbaddog"
+__revision__ = "src/engine/SCons/SConf.py e724ae812eb96f4858a132f5b8c769724744faf6 2019-07-21 00:04:47 bdeegan"
 
 import SCons.compat
 
@@ -56,7 +56,6 @@ import SCons.Warnings
 import SCons.Conftest
 
 from SCons.Debug import Trace
-from SCons.Node import DeciderNeedsNode
 
 # Turn off the Conftest error logging
 SCons.Conftest.LogInputFiles = 0
@@ -247,6 +246,7 @@ class SConfBuildTask(SCons.Taskmaster.AlwaysTask):
         # ConfigureCacheError and if yes, reraise the exception
         exc_type = self.exc_info()[0]
         if issubclass(exc_type, SConfError):
+            # TODO pylint E0704: bare raise not inside except
             raise
         elif issubclass(exc_type, SCons.Errors.BuildError):
             # we ignore Build Errors (occurs, when a test doesn't pass)
@@ -406,12 +406,10 @@ class SConfBase(object):
             # 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,
-                            node=None):
+                            repo_node=None,
+                            env_decider=env.decide_source):
                 try:
-                    env_decider(dependency, target, prev_ni)
-                except DeciderNeedsNode as e:
-                    e.decider(target, prev_ni, node=target)
+                    env_decider(dependency, target, prev_ni, repo_node)
                 except Exception as e:
                     raise e
                 return True
@@ -787,7 +785,7 @@ class SConfBase(object):
 
         self.active = 0
         sconf_global = None
-        if not self.config_h is None:
+        if self.config_h is not None:
             _ac_config_hs[self.config_h] = self.config_h_text
         self.env.fs = self.lastEnvFs