diff options
author | Gary Oberbrunner <garyo@oberbrunner.com> | 2012-02-04 13:20:36 -0500 |
---|---|---|
committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2012-02-04 13:20:36 -0500 |
commit | 31f56102b84af42ebf83f664da5039c15dacc85c (patch) | |
tree | 92292cfcee94be0ba95d0467c498a28821a4021c | |
parent | e2b6cf4ae469210b92c76c7460031272cbbee208 (diff) | |
parent | 59cc4a7db4a7278b349998455753c7022bfe4793 (diff) | |
download | scons-31f56102b84af42ebf83f664da5039c15dacc85c.tar.gz |
Merged fixes from Richard Quirk
-rw-r--r-- | src/engine/SCons/Action.py | 2 | ||||
-rw-r--r-- | src/engine/SCons/Conftest.py | 2 | ||||
-rw-r--r-- | src/engine/SCons/SConfTests.py | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/engine/SCons/Action.py b/src/engine/SCons/Action.py index 6909a9ac..c1eef756 100644 --- a/src/engine/SCons/Action.py +++ b/src/engine/SCons/Action.py @@ -899,7 +899,7 @@ class CommandGeneratorAction(ActionBase): show=_null, execute=_null, chdir=_null, executor=None): act = self._generate(target, source, env, 0, executor) if act is None: - raise UserError("While building `%s': " + raise SCons.Errors.UserError("While building `%s': " "Cannot deduce file extension from source files: %s" % (repr(list(map(str, target))), repr(list(map(str, source))))) return act(target, source, env, exitstatfunc, presub, diff --git a/src/engine/SCons/Conftest.py b/src/engine/SCons/Conftest.py index 04a6bc2a..d4662780 100644 --- a/src/engine/SCons/Conftest.py +++ b/src/engine/SCons/Conftest.py @@ -554,7 +554,7 @@ def CheckDeclaration(context, symbol, includes = None, language = None): lang, suffix, msg = _lang2suffix(language) if msg: - context.Display("Cannot check for declaration %s: %s\n" % (type_name, msg)) + context.Display("Cannot check for declaration %s: %s\n" % (symbol, msg)) return msg src = includetext + includes diff --git a/src/engine/SCons/SConfTests.py b/src/engine/SCons/SConfTests.py index b05c4cc8..e6048860 100644 --- a/src/engine/SCons/SConfTests.py +++ b/src/engine/SCons/SConfTests.py @@ -697,6 +697,8 @@ int main() { assert r, "__cplusplus not declared in C++ ??" r = sconf.CheckDeclaration('__cplusplus', language = 'C') assert not r, "__cplusplus declared in C ??" + r = sconf.CheckDeclaration('unknown', language = 'Unknown') + assert not r, "unknown language was supported ??" finally: sconf.Finish() |