diff options
Diffstat (limited to 'src/engine/SCons/Node/FS.py')
| -rw-r--r-- | src/engine/SCons/Node/FS.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py index 8db2928..9e0e6f6 100644 --- a/src/engine/SCons/Node/FS.py +++ b/src/engine/SCons/Node/FS.py @@ -1450,15 +1450,18 @@ class Dir(Base): elif not other in self.path_elements: try: - other_dir = other.dir + other_dir = other.get_dir() except AttributeError: result = str(other) else: - dir_rel_path = self.rel_path(other_dir) - if dir_rel_path == '.': + if other_dir is None: result = other.name else: - result = dir_rel_path + os.sep + other.name + dir_rel_path = self.rel_path(other_dir) + if dir_rel_path == '.': + result = other.name + else: + result = dir_rel_path + os.sep + other.name else: |