diff options
| author | Steven Knight <knight@baldmt.com> | 2005-06-11 12:34:46 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2005-06-11 12:34:46 (GMT) |
| commit | c7027ef1090fc224c9b519dfb2b6928cb3a3512e (patch) | |
| tree | cb6ad0b4b4c74488881ce054c0b3eee3fa34ca70 /src/engine/SCons/Node/FS.py | |
| parent | 0462645d5027fcf4286775d88d2f6fb52abad3b1 (diff) | |
| download | SCons-c7027ef1090fc224c9b519dfb2b6928cb3a3512e.zip SCons-c7027ef1090fc224c9b519dfb2b6928cb3a3512e.tar.gz SCons-c7027ef1090fc224c9b519dfb2b6928cb3a3512e.tar.bz2 | |
Gary's bug.
Diffstat (limited to 'src/engine/SCons/Node/FS.py')
| -rw-r--r-- | src/engine/SCons/Node/FS.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py index a1cadf0..f2eb1aa 100644 --- a/src/engine/SCons/Node/FS.py +++ b/src/engine/SCons/Node/FS.py @@ -909,7 +909,15 @@ class FS(LocalFS): # Lookup the directory for orig, norm in map(None, path_orig, path_norm): try: - directory = directory.entries[norm] + entries = directory.entries + except AttributeError: + # We tried to look up the entry in either an Entry or + # a File. Give whatever it is a chance to do what's + # appropriate: morph into a Dir or raise an exception. + directory.must_be_a_Dir() + entries = directory.entries + try: + directory = entries[norm] except KeyError: if not create: raise SCons.Errors.UserError @@ -923,12 +931,6 @@ class FS(LocalFS): directory.entries[norm] = d directory.add_wkid(d) directory = d - except AttributeError: - # We tried to look up the entry in either an Entry or - # a File. Give whatever it is a chance to do what's - # appropriate: morph into a Dir or raise an exception. - directory.must_be_a_Dir() - directory = directory.entries[norm] directory.must_be_a_Dir() |