Issue 2121: fix handling #includes of files in VariantDir subdirectories,

by having it handle checking for VariantDir directories on disk like
it does VariantDir files.
(patch:  Jared Grubb; test case:  Ali Tofigh)

2 files changed, 12 insertions, 1 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 53d2b24..c87ff0c 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -14,6 +14,10 @@ RELEASE 1.X - XXX
 
     - Fix Glob() polluting LIBPATH by returning copy of list
 
+  From Jared Grubb:
+
+    - Fix VariantDir duplication of #included files in subdirectories.
+
   From Steven Knight:
 
     - Fix the ability of the add_src_builder() method to add a new
@@ -31,6 +35,10 @@ RELEASE 1.X - XXX
     - Make Glob() sort the returned list of Files or Nodes
       to prevent spurious rebuilds.
 
+  From Ali Tofigh:
+
+    - Add a test to verify duplication of files in VariantDir subdirectories.
+
 
 
 RELEASE 1.0.1 - Sat, 06 Sep 2008 07:29:34 -0700
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index a94171b..8d11e4e 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -1780,7 +1780,10 @@ class Dir(Base):
         if self.entry_exists_on_disk(name):
             try: return self.Dir(name)
             except TypeError: pass
-        return None
+        node = self.srcdir_duplicate(name)
+        if isinstance(node, File):
+            return None
+        return node
 
     def file_on_disk(self, name):
         if self.entry_exists_on_disk(name) or \