diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-06 17:47:43 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-16 12:31:20 +0100 |
commit | 8c238504536c9af824557622a1e284ebf0b884a5 (patch) | |
tree | 2418a7a5de12528ad8e2ce2f338fda8205f51175 | |
parent | 009343b2a298d0fd94ef4bbf780c76cca622e9e0 (diff) | |
download | poky-8c238504536c9af824557622a1e284ebf0b884a5.tar.gz |
bitbake: runqueue: Allow taskname to be passed to check_stamp_task()
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index d0a23da73c..31978d49ba 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -776,7 +776,7 @@ class RunQueue: | |||
776 | bb.msg.fatal(bb.msg.domain.RunQueue, "check_stamps fatal internal error") | 776 | bb.msg.fatal(bb.msg.domain.RunQueue, "check_stamps fatal internal error") |
777 | return current | 777 | return current |
778 | 778 | ||
779 | def check_stamp_task(self, task): | 779 | def check_stamp_task(self, task, taskname = None): |
780 | 780 | ||
781 | if self.stamppolicy == "perfile": | 781 | if self.stamppolicy == "perfile": |
782 | fulldeptree = False | 782 | fulldeptree = False |
@@ -787,7 +787,8 @@ class RunQueue: | |||
787 | stampwhitelist = self.stampfnwhitelist | 787 | stampwhitelist = self.stampfnwhitelist |
788 | 788 | ||
789 | fn = self.taskData.fn_index[self.runq_fnid[task]] | 789 | fn = self.taskData.fn_index[self.runq_fnid[task]] |
790 | taskname = self.runq_task[task] | 790 | if taskname is None: |
791 | taskname = self.runq_task[task] | ||
791 | stampfile = "%s.%s" % (self.dataCache.stamp[fn], taskname) | 792 | stampfile = "%s.%s" % (self.dataCache.stamp[fn], taskname) |
792 | # If the stamp is missing its not current | 793 | # If the stamp is missing its not current |
793 | if not os.access(stampfile, os.F_OK): | 794 | if not os.access(stampfile, os.F_OK): |
@@ -928,12 +929,12 @@ class RunQueue: | |||
928 | while True: | 929 | while True: |
929 | task = None | 930 | task = None |
930 | if self.stats.active < self.number_tasks: | 931 | if self.stats.active < self.number_tasks: |
931 | task = next(self.sched) | 932 | task = self.sched.next() |
932 | if task is not None: | 933 | if task is not None: |
933 | fn = self.taskData.fn_index[self.runq_fnid[task]] | 934 | fn = self.taskData.fn_index[self.runq_fnid[task]] |
934 | 935 | ||
935 | taskname = self.runq_task[task] | 936 | taskname = self.runq_task[task] |
936 | if self.check_stamp_task(task): | 937 | if self.check_stamp_task(task, taskname): |
937 | bb.msg.debug(2, bb.msg.domain.RunQueue, "Stamp current task %s (%s)" % (task, self.get_user_idstring(task))) | 938 | bb.msg.debug(2, bb.msg.domain.RunQueue, "Stamp current task %s (%s)" % (task, self.get_user_idstring(task))) |
938 | self.runq_running[task] = 1 | 939 | self.runq_running[task] = 1 |
939 | self.runq_buildable[task] = 1 | 940 | self.runq_buildable[task] = 1 |