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/Environment.py | |
| parent | 5652ab4cab956f8426b1bc8d6dd0cc4ecf39f51d (diff) | |
| parent | 0de5191eaec0321118254673e8f8414228668818 (diff) | |
Merge commit 'upstream/1.2.0.d20100306'
Diffstat (limited to 'engine/SCons/Environment.py')
| -rw-r--r-- | engine/SCons/Environment.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/engine/SCons/Environment.py b/engine/SCons/Environment.py index 23b0719..d3455e0 100644 --- a/engine/SCons/Environment.py +++ b/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): |