diff options
| author | Steven Knight <knight@baldmt.com> | 2005-05-29 14:10:24 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2005-05-29 14:10:24 (GMT) |
| commit | f5d37d48553e04629fb7f6feac6e3b6c2243ee65 (patch) | |
| tree | 6174ed7ca2298e018a5b5ee4f5ba155a9123399d /src/engine/SCons/Node/FS.py | |
| parent | cbedf0f4edb9c97758d1a2173864aa429159cb78 (diff) | |
| download | SCons-f5d37d48553e04629fb7f6feac6e3b6c2243ee65.zip SCons-f5d37d48553e04629fb7f6feac6e3b6c2243ee65.tar.gz SCons-f5d37d48553e04629fb7f6feac6e3b6c2243ee65.tar.bz2 | |
Fix lookups of same-named files.
Diffstat (limited to 'src/engine/SCons/Node/FS.py')
| -rw-r--r-- | src/engine/SCons/Node/FS.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py index 9203e18..527d1e3 100644 --- a/src/engine/SCons/Node/FS.py +++ b/src/engine/SCons/Node/FS.py @@ -840,7 +840,7 @@ class FS(LocalFS): # look at the actual filesystem and make sure there isn't # a file already there - path = directory.entry_path(orig) + path = directory.entry_abspath(orig) if self.isfile(path): raise TypeError, \ "File %s found where directory expected." % path @@ -866,7 +866,7 @@ class FS(LocalFS): # make sure we don't create File nodes when there is actually # a directory at that path on the disk, and vice versa - path = directory.entry_path(last_orig) + path = directory.entry_abspath(last_orig) if fsclass == File: if self.isdir(path): raise TypeError, \ |