diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-02-28 17:15:48 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-02-28 17:15:48 (GMT) |
| commit | 5a7473d2fd2add15c8489cb57c4820ea0d36c3d0 (patch) | |
| tree | 079a1d95871160b33df209859afa082a4765bbb9 /src/engine/SCons/Builder.py | |
| parent | c39f298d26094ade15d9c058b771e58eaf70138c (diff) | |
| download | SCons-5a7473d2fd2add15c8489cb57c4820ea0d36c3d0.zip SCons-5a7473d2fd2add15c8489cb57c4820ea0d36c3d0.tar.gz SCons-5a7473d2fd2add15c8489cb57c4820ea0d36c3d0.tar.bz2 | |
Fix error message to output string and not bytearray(...) when two environments with different actions.. py2/3 fix
Diffstat (limited to 'src/engine/SCons/Builder.py')
| -rw-r--r-- | src/engine/SCons/Builder.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py index c7bce3a..6f606ee 100644 --- a/src/engine/SCons/Builder.py +++ b/src/engine/SCons/Builder.py @@ -299,7 +299,7 @@ def _node_errors(builder, env, tlist, slist): msg = "Two different environments were specified for target %s,\n\tbut they appear to have the same action: %s" % (t, action.genstring(tlist, slist, t.env)) SCons.Warnings.warn(SCons.Warnings.DuplicateEnvironmentWarning, msg) else: - msg = "Two environments with different actions were specified for the same target: %s\n(action 1: %s)\n(action 2: %s)" % (t,t_contents,contents) + msg = "Two environments with different actions were specified for the same target: %s\n(action 1: %s)\n(action 2: %s)" % (t,t_contents.decode('utf-8'),contents.decode('utf-8')) raise UserError(msg) if builder.multi: if t.builder != builder: |