diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2010-03-10 14:14:33 +0100 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2010-03-10 14:14:33 +0100 |
| commit | df69433d6a185b997f1ec3c0d30768061c5b500f (patch) | |
| tree | f976ed6769e1273e04dca843c18d8bf87fc9b976 /src/engine/SCons/Scanner/__init__.py | |
| parent | da3aa9be25ad2463a8f27318b914d2322f782a9e (diff) | |
| parent | 68e4fe5ac49effe8959bc8532584edf04553c931 (diff) | |
Merge commit 'upstream/1.2.0.d20100306'
Diffstat (limited to 'src/engine/SCons/Scanner/__init__.py')
| -rw-r--r-- | src/engine/SCons/Scanner/__init__.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/engine/SCons/Scanner/__init__.py b/src/engine/SCons/Scanner/__init__.py index 83ca110..5e8eb47 100644 --- a/src/engine/SCons/Scanner/__init__.py +++ b/src/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): |