diff options
| author | Steven Knight <knight@baldmt.com> | 2003-12-01 13:06:29 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2003-12-01 13:06:29 (GMT) |
| commit | 1449e5067298043a8cd9b26a9030f5909cfb00fb (patch) | |
| tree | 6f7aaa5f6e05039884cb82deafa9a4f99b3682a7 /src/engine/SCons/Script/__init__.py | |
| parent | 04e36a29829d2fde6fe82af08bd1b5259ed7a7b9 (diff) | |
| download | SCons-1449e5067298043a8cd9b26a9030f5909cfb00fb.zip SCons-1449e5067298043a8cd9b26a9030f5909cfb00fb.tar.gz SCons-1449e5067298043a8cd9b26a9030f5909cfb00fb.tar.bz2 | |
Make the message about missing SConscript files a warning, not a hard write(), so it can be ignored/disabled. (Scott Fritchie)
Diffstat (limited to 'src/engine/SCons/Script/__init__.py')
| -rw-r--r-- | src/engine/SCons/Script/__init__.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py index 0134b97..0e56214 100644 --- a/src/engine/SCons/Script/__init__.py +++ b/src/engine/SCons/Script/__init__.py @@ -352,8 +352,12 @@ def _setup_warn(arg): if len(elems) == 1 and elems[0] == 'all': class_name = "Warning" else: - class_name = string.join(map(string.capitalize, elems), '') + \ - "Warning" + def _capitalize(s): + if s[:5] == "scons": + return "SCons" + s[5:] + else: + return string.capitalize(s) + class_name = string.join(map(_capitalize, elems), '') + "Warning" try: clazz = getattr(SCons.Warnings, class_name) except AttributeError: @@ -703,8 +707,9 @@ def _main(args, parser): # Enable deprecated warnings by default. SCons.Warnings._warningOut = _scons_internal_warning - SCons.Warnings.enableWarningClass(SCons.Warnings.DeprecatedWarning) SCons.Warnings.enableWarningClass(SCons.Warnings.CorruptSConsignWarning) + SCons.Warnings.enableWarningClass(SCons.Warnings.DeprecatedWarning) + SCons.Warnings.enableWarningClass(SCons.Warnings.MissingSConscriptWarning) SCons.Warnings.enableWarningClass(SCons.Warnings.NoParallelSupportWarning) global ssoptions |