summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2016-01-14 00:20:00 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2016-01-14 00:20:00 (GMT)
commitefe586285488a4b2087631c54e14b5c07f6f7909 (patch)
tree5ccddc5470443c8183954bf99a0116184d07f6f9 /src
parentecb75f53e36ae33fa4874b3d8df478628b47018e (diff)
downloadSCons-efe586285488a4b2087631c54e14b5c07f6f7909.zip
SCons-efe586285488a4b2087631c54e14b5c07f6f7909.tar.gz
SCons-efe586285488a4b2087631c54e14b5c07f6f7909.tar.bz2
Fix bug 2081: Better messaging for different actions for same target in two environments
Diffstat (limited to 'src')
-rw-r--r--src/engine/SCons/Builder.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py
index b457d1e..80dcaca 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" % t
+ 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)
raise UserError(msg)
if builder.multi:
if t.builder != builder: