diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2010-03-10 13:49:40 +0100 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2010-03-10 13:49:40 +0100 |
| commit | eff7b513913aa21f41c6e304dcf5178f8bffa980 (patch) | |
| tree | d991f365c5fb334ecc08f245aa008943930b83b9 /engine/SCons/Scanner/__init__.py | |
| parent | 5652ab4cab956f8426b1bc8d6dd0cc4ecf39f51d (diff) | |
| parent | 0de5191eaec0321118254673e8f8414228668818 (diff) | |
Merge commit 'upstream/1.2.0.d20100306'
Diffstat (limited to 'engine/SCons/Scanner/__init__.py')
| -rw-r--r-- | engine/SCons/Scanner/__init__.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engine/SCons/Scanner/__init__.py b/engine/SCons/Scanner/__init__.py index 83ca110..5e8eb47 100644 --- a/engine/SCons/Scanner/__init__.py +++ b/engine/SCons/Scanner/__init__.py @@ -27,7 +27,7 @@ The Scanner package for the SCons software construction utility. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Scanner/__init__.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Scanner/__init__.py 4691 2010/03/06 16:22:36 bdbaddog" import re import string @@ -92,7 +92,9 @@ class Base: argument = _null, skeys = _null, path_function = None, - node_class = SCons.Node.FS.Entry, + # Node.FS.Base so that, by default, it's okay for a + # scanner to return a Dir, File or Entry. + node_class = SCons.Node.FS.Base, node_factory = None, scan_check = None, recursive = None): |