diff options
| author | Steven Knight <knight@baldmt.com> | 2008-09-13 04:57:59 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2008-09-13 04:57:59 (GMT) |
| commit | acc0a91ba1351ea3d48a402ff208239503cc27a9 (patch) | |
| tree | f264434144ab877e2b86f391a259f5026cb8fc93 /src/engine | |
| parent | 308079e3a60d8fc7e038ea264f4f60e085f99b23 (diff) | |
| download | SCons-acc0a91ba1351ea3d48a402ff208239503cc27a9.zip SCons-acc0a91ba1351ea3d48a402ff208239503cc27a9.tar.gz SCons-acc0a91ba1351ea3d48a402ff208239503cc27a9.tar.bz2 | |
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)
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/Node/FS.py | 5 |
1 files changed, 4 insertions, 1 deletions
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 \ |