diff options
| author | William Deegan <bill@baddogconsulting.com> | 2019-07-31 22:09:11 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-31 22:09:11 (GMT) |
| commit | e7f2089ab5e0aa30ea6d054ea8edefd776b48445 (patch) | |
| tree | 0779550b46a2471ea03421bf1872d87b07335d5d /src/engine | |
| parent | 7cfa138fdf8a89aaa1555fcc211308bd0a42a3e6 (diff) | |
| parent | 6f14cfb16b620af1c2667926aaaa80d26b8033a2 (diff) | |
| download | SCons-e7f2089ab5e0aa30ea6d054ea8edefd776b48445.zip SCons-e7f2089ab5e0aa30ea6d054ea8edefd776b48445.tar.gz SCons-e7f2089ab5e0aa30ea6d054ea8edefd776b48445.tar.bz2 | |
Merge pull request #3418 from dragon512/fix-regression
Fix regression in 3.1.0 with removal of DeciderNeedsNode
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/Node/FS.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Node/__init__.py | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py index 33105fb..6b0fe98 100644 --- a/src/engine/SCons/Node/FS.py +++ b/src/engine/SCons/Node/FS.py @@ -3436,6 +3436,8 @@ class File(Base): Boolean - Indicates if node(File) has changed. """ + if node is None: + node = self # Now get sconsign name -> csig map and then get proper prev_ni if possible bi = node.get_stored_info().binfo rebuilt = False diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py index 3073d59..572465f 100644 --- a/src/engine/SCons/Node/__init__.py +++ b/src/engine/SCons/Node/__init__.py @@ -1661,10 +1661,7 @@ class Node(object, with_metaclass(NoSlotsPyPy)): if k not in old_bkids: lines.append("`%s' is a new dependency\n" % stringify(k)) else: - try: - changed = _decider_map[k.changed_since_last_build](k, self, osig[k]) - except DeciderNeedsNode as e: - changed = e.decider(self, osig[k], node=self) + changed = _decider_map[k.changed_since_last_build](k, self, osig[k]) if changed: lines.append("`%s' changed\n" % stringify(k)) |