diff options
author | Luca Falavigna <dktrkranz@debian.org> | 2010-03-10 13:49:35 +0100 |
---|---|---|
committer | Luca Falavigna <dktrkranz@debian.org> | 2010-03-10 13:49:35 +0100 |
commit | 0de5191eaec0321118254673e8f8414228668818 (patch) | |
tree | fa5fb737b2a453248fed63f1fcec5a9ff125fea3 /engine/SCons/Taskmaster.py | |
parent | 7764805dd1d4df1cf1bdfe2ad1f2e130d91f515a (diff) |
Imported Upstream version 1.2.0.d20100306upstream/1.2.0.d20100306
Diffstat (limited to 'engine/SCons/Taskmaster.py')
-rw-r--r-- | engine/SCons/Taskmaster.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/engine/SCons/Taskmaster.py b/engine/SCons/Taskmaster.py index 7998cf5..1da3f0a 100644 --- a/engine/SCons/Taskmaster.py +++ b/engine/SCons/Taskmaster.py @@ -48,7 +48,7 @@ interface and the SCons build engine. There are two key classes here: target(s) that it decides need to be evaluated and/or built. """ -__revision__ = "src/engine/SCons/Taskmaster.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Taskmaster.py 4691 2010/03/06 16:22:36 bdbaddog" from itertools import chain import operator @@ -359,7 +359,8 @@ class Task: for t in self.targets: t.disambiguate().set_state(NODE_EXECUTING) for s in t.side_effects: - s.set_state(NODE_EXECUTING) + # add disambiguate here to mirror the call on targets above + s.disambiguate().set_state(NODE_EXECUTING) def make_ready_current(self): """ @@ -390,7 +391,8 @@ class Task: for t in self.targets: t.set_state(NODE_EXECUTING) for s in t.side_effects: - s.set_state(NODE_EXECUTING) + # add disambiguate here to mirror the call on targets in first loop above + s.disambiguate().set_state(NODE_EXECUTING) else: for t in self.targets: # We must invoke visited() to ensure that the node |