diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-11-16 05:58:16 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-11-16 05:58:16 +0100 |
| commit | 60df8165e6be58369d76af4d38388c9846d82975 (patch) | |
| tree | 827a72e604ad686e6817a40ff0dcaef405212276 /engine/SCons/Builder.py | |
| parent | 9948951ec4fcd3c29d7d7ba981de1d1fea275595 (diff) | |
| parent | 6a570afd28bccdb118edde36488ba9834494d6c7 (diff) | |
Merge tag 'upstream/2.4.1'
Upstream version 2.4.1
Diffstat (limited to 'engine/SCons/Builder.py')
| -rw-r--r-- | engine/SCons/Builder.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/SCons/Builder.py b/engine/SCons/Builder.py index 4c68d5c..6bdd008 100644 --- a/engine/SCons/Builder.py +++ b/engine/SCons/Builder.py @@ -97,7 +97,7 @@ There are the following methods for internal use within this module: # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -__revision__ = "src/engine/SCons/Builder.py rel_2.4.0:3365:9259ea1c13d7 2015/09/21 14:03:43 bdbaddog" +__revision__ = "src/engine/SCons/Builder.py rel_2.4.1:3453:73fefd3ea0b0 2015/11/09 03:25:05 bdbaddog" import collections @@ -292,8 +292,8 @@ def _node_errors(builder, env, tlist, slist): if t.has_explicit_builder(): if not t.env is None and not t.env is env: action = t.builder.action - t_contents = action.get_contents(tlist, slist, t.env) - contents = action.get_contents(tlist, slist, env) + t_contents = t.builder.action.get_contents(tlist, slist, t.env) + contents = builder.action.get_contents(tlist, slist, env) if t_contents == contents: 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)) |