Do not throw an exception if the type of a stored implicit dependency has changed since last run. (Dobes Vandermeer)

2 files changed, 19 insertions, 2 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 8bf385f..4e8e377 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -739,6 +739,10 @@ RELEASE 0.97 - XXX
     external environment, or settable internally) to put a shortened
     SCons execution line in the Visual Studio project file.
 
+  - Don't throw an exception if the configuration changes and a stored
+    implicit dependency now has a different type (File or Dir) than it
+    did last time.
+
   From Greg Ward:
 
   - Fix a misplaced line in the man page.
diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py
index b04284d..e73e5f3 100644
--- a/src/engine/SCons/Node/__init__.py
+++ b/src/engine/SCons/Node/__init__.py
@@ -516,8 +516,21 @@ class Node:
             implicit = self.get_stored_implicit()
             if implicit:
                 factory = build_env.get_factory(self.builder.source_factory)
-                implicit = map(factory, implicit)
-                self._add_child(self.implicit, self.implicit_dict, implicit)
+                nodes = []
+                for i in implicit:
+                    try:
+                        n = factory(i)
+                    except TypeError:
+                        # The implicit dependency was cached as one type
+                        # of Node last time, but the configuration has
+                        # changed (probably) and it's a different type
+                        # this time.  Just ignore the mismatch and go
+                        # with what our current configuration says the
+                        # Node is.
+                        pass
+                    else:
+                        nodes.append(n)
+                self._add_child(self.implicit, self.implicit_dict, nodes)
                 calc = build_env.get_calculator()
                 if implicit_deps_unchanged or self.current(calc):
                     return