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/Environment.py | |
| parent | da3aa9be25ad2463a8f27318b914d2322f782a9e (diff) | |
| parent | 68e4fe5ac49effe8959bc8532584edf04553c931 (diff) | |
Merge commit 'upstream/1.2.0.d20100306'
Diffstat (limited to 'src/engine/SCons/Environment.py')
| -rw-r--r-- | src/engine/SCons/Environment.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py index 23b0719..d3455e0 100644 --- a/src/engine/SCons/Environment.py +++ b/src/engine/SCons/Environment.py @@ -32,7 +32,7 @@ Environment # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Environment.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Environment.py 4691 2010/03/06 16:22:36 bdbaddog" import copy @@ -152,6 +152,9 @@ def _set_BUILDERS(env, key, value): except KeyError: bd = BuilderDict(kwbd, env) env._dict[key] = bd + for k, v in value.items(): + if not SCons.Builder.is_a_Builder(v): + raise SCons.Errors.UserError('%s is not a Builder.' % repr(v)) bd.update(value) def _del_SCANNERS(env, key): |