diff options
| author | Steven Knight <knight@baldmt.com> | 2001-12-13 04:42:05 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2001-12-13 04:42:05 (GMT) |
| commit | c81b4be9b7a06dc41cc1f425887d4600fa47f0bc (patch) | |
| tree | a800b193675c98825b6af007b88b1fb51c41c3e4 /src/engine/SCons/Node/FS.py | |
| parent | b9f370f232001d693f10279a3bcff8a0e66eb303 (diff) | |
| download | SCons-c81b4be9b7a06dc41cc1f425887d4600fa47f0bc.zip SCons-c81b4be9b7a06dc41cc1f425887d4600fa47f0bc.tar.gz SCons-c81b4be9b7a06dc41cc1f425887d4600fa47f0bc.tar.bz2 | |
Bug fixes for Scanner handling of subdirectories and Environment copying, courtesy Charles Crain.
Diffstat (limited to 'src/engine/SCons/Node/FS.py')
| -rw-r--r-- | src/engine/SCons/Node/FS.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py index cd12f6d..648e1f9 100644 --- a/src/engine/SCons/Node/FS.py +++ b/src/engine/SCons/Node/FS.py @@ -466,11 +466,12 @@ class File(Entry): return self.dir.sconsign().get(self.name) def scan(self): - if not self.scanned.has_key(self.scanner) and self.env: - if self.scanner: - self.add_implicit(self.scanner.scan(self.path, self.env), - self.scanner) - self.scanned[self.scanner] = 1 + if self.env: + for scn in self.scanners: + if not self.scanned.has_key(scn): + self.add_implicit(scn.scan(self.path, self.env), + scn) + self.scanned[scn] = 1 def __createDir(self): # ensure that the directories for this node are |