diff options
| author | Steven Knight <knight@baldmt.com> | 2005-03-01 02:01:53 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2005-03-01 02:01:53 (GMT) |
| commit | c4b35b0ad854432a32fe9d09c2fdd8bdafc40fd8 (patch) | |
| tree | 1f909659d67d0c8910a1837f3c8323f5686ad6c5 /src/engine/SCons/Node/FS.py | |
| parent | 69e1562853db2f1836a0942e1cc01aeb87858a9d (diff) | |
| download | SCons-c4b35b0ad854432a32fe9d09c2fdd8bdafc40fd8.zip SCons-c4b35b0ad854432a32fe9d09c2fdd8bdafc40fd8.tar.gz SCons-c4b35b0ad854432a32fe9d09c2fdd8bdafc40fd8.tar.bz2 | |
Don't throw a 'Tried to lookup a File as a Dir' exception if there's a same-named file as a directory we might try to search for an included file.
Diffstat (limited to 'src/engine/SCons/Node/FS.py')
| -rw-r--r-- | src/engine/SCons/Node/FS.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py index e7b283d..e42166f 100644 --- a/src/engine/SCons/Node/FS.py +++ b/src/engine/SCons/Node/FS.py @@ -1888,7 +1888,14 @@ def find_file(filename, paths, node_factory=default_fs.File, verbose=None): for pathdir in paths: verbose("looking for '%s' in '%s' ...\n" % (filename, pathdir)) - dir = lookup_dir(pathdir) + + try: dir = lookup_dir(pathdir) + except TypeError: dir = None + if not dir: + # We tried to look up a directory, but it seems there's + # already a file node (or something else) there. No big. + continue + def func(node): if isinstance(node, SCons.Node.FS.File) and \ (node.is_derived() or node.is_pseudo_derived() or node.exists()): |