summaryrefslogtreecommitdiff
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-07-06 17:47:43 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-16 12:31:20 +0100
commit8c238504536c9af824557622a1e284ebf0b884a5 (patch)
tree2418a7a5de12528ad8e2ce2f338fda8205f51175 /bitbake
parent009343b2a298d0fd94ef4bbf780c76cca622e9e0 (diff)
downloadopenembedded-core-8c238504536c9af824557622a1e284ebf0b884a5.tar.gz
openembedded-core-8c238504536c9af824557622a1e284ebf0b884a5.tar.bz2
openembedded-core-8c238504536c9af824557622a1e284ebf0b884a5.tar.xz
openembedded-core-8c238504536c9af824557622a1e284ebf0b884a5.zip
bitbake: runqueue: Allow taskname to be passed to check_stamp_task()
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/runqueue.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index d0a23da73..31978d49b 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -776,7 +776,7 @@ class RunQueue:
bb.msg.fatal(bb.msg.domain.RunQueue, "check_stamps fatal internal error")
return current
- def check_stamp_task(self, task):
+ def check_stamp_task(self, task, taskname = None):
if self.stamppolicy == "perfile":
fulldeptree = False
@@ -787,7 +787,8 @@ class RunQueue:
stampwhitelist = self.stampfnwhitelist
fn = self.taskData.fn_index[self.runq_fnid[task]]
- taskname = self.runq_task[task]
+ if taskname is None:
+ taskname = self.runq_task[task]
stampfile = "%s.%s" % (self.dataCache.stamp[fn], taskname)
# If the stamp is missing its not current
if not os.access(stampfile, os.F_OK):
@@ -928,12 +929,12 @@ class RunQueue:
while True:
task = None
if self.stats.active < self.number_tasks:
- task = next(self.sched)
+ task = self.sched.next()
if task is not None:
fn = self.taskData.fn_index[self.runq_fnid[task]]
taskname = self.runq_task[task]
- if self.check_stamp_task(task):
+ if self.check_stamp_task(task, taskname):
bb.msg.debug(2, bb.msg.domain.RunQueue, "Stamp current task %s (%s)" % (task, self.get_user_idstring(task)))
self.runq_running[task] = 1
self.runq_buildable[task] = 1