diff options
| author | Steven Knight <knight@baldmt.com> | 2007-05-18 05:40:31 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2007-05-18 05:40:31 (GMT) |
| commit | 9732927a82f458a4a672874b5a9cee8ac025d4e8 (patch) | |
| tree | 4d532be0f91384214c930e1150d7e6becd44a92d /src/engine/SCons/Scanner/Dir.py | |
| parent | 84a531159a6e54d0fac324b29d664b93230a20db (diff) | |
| download | SCons-0.97.zip SCons-0.97.tar.gz SCons-0.97.tar.bz2 | |
Merged revisions 1884-1905 via svnmerge from0.97
http://scons.tigris.org/svn/scons/branches/core
........
r1891 | stevenknight | 2007-04-24 08:57:03 -0500 (Tue, 24 Apr 2007) | 1 line
0.96.D632 - Fix 0.96.96 reference count regression during parallel builds.
........
r1892 | stevenknight | 2007-04-24 12:51:05 -0500 (Tue, 24 Apr 2007) | 1 line
0.96.D633 - Fix documented default value(s) of $MSVS_USE_MFC_DIRS.
........
r1893 | stevenknight | 2007-04-24 16:12:14 -0500 (Tue, 24 Apr 2007) | 1 line
0.96.D634 - Make the DirEntryScanner tolerant of non-Dir nodes.
........
r1898 | stevenknight | 2007-05-09 15:07:15 -0500 (Wed, 09 May 2007) | 1 line
0.96.D635 - Portability fixes in test scripts.
........
r1899 | stevenknight | 2007-05-12 08:19:13 -0500 (Sat, 12 May 2007) | 1 line
0.96.D636 - Update documentation with rudimentary Tool module descriptions.
........
r1901 | stevenknight | 2007-05-17 14:32:14 -0500 (Thu, 17 May 2007) | 1 line
0.97.D001 - Initialize 0.97 for release.
........
Diffstat (limited to 'src/engine/SCons/Scanner/Dir.py')
| -rw-r--r-- | src/engine/SCons/Scanner/Dir.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/engine/SCons/Scanner/Dir.py b/src/engine/SCons/Scanner/Dir.py index 535150a..9203fb2 100644 --- a/src/engine/SCons/Scanner/Dir.py +++ b/src/engine/SCons/Scanner/Dir.py @@ -92,6 +92,14 @@ def scan_in_memory(node, env, path=()): """ "Scans" a Node.FS.Dir for its in-memory entries. """ - entry_list = filter(do_not_scan, node.entries.keys()) + try: + entries = node.entries + except AttributeError: + # It's not a Node.FS.Dir (or doesn't look enough like one for + # our purposes), which can happen if a target list containing + # mixed Node types (Dirs and Files, for example) has a Dir as + # the first entry. + return [] + entry_list = filter(do_not_scan, entries.keys()) entry_list.sort() - return map(lambda n, e=node.entries: e[n], entry_list) + return map(lambda n, e=entries: e[n], entry_list) |