From b22592af8145a8c7c4ada2fa7c1dee2e753eca46 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 25 Jul 2012 18:56:00 +0000 Subject: bitbake: runqueue.py: Ensure one setscene function doesn't mask out another which needs to run The scenequeue code could result in one setscene function masking out another which had been marked as notcovered. This change ensures the notcovered list is taken into account when deciding which tasks need to be run, ensuring that tasks that should be run do get run. (Bitbake rev: 95b31127d8ba12ccb061d67481ece134c18c39f2) Signed-off-by: Richard Purdie --- bitbake/lib/bb/runqueue.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index fd33d0702e..a4009d4e9b 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -1178,7 +1178,7 @@ class RunQueueExecuteTasks(RunQueueExecute): self.runq_buildable.append(1) else: self.runq_buildable.append(0) - if len(self.rqdata.runq_revdeps[task]) > 0 and self.rqdata.runq_revdeps[task].issubset(self.rq.scenequeue_covered): + if len(self.rqdata.runq_revdeps[task]) > 0 and self.rqdata.runq_revdeps[task].issubset(self.rq.scenequeue_covered) and task not in self.rq.scenequeue_notcovered: self.rq.scenequeue_covered.add(task) found = True @@ -1189,7 +1189,7 @@ class RunQueueExecuteTasks(RunQueueExecute): continue logger.debug(1, 'Considering %s (%s): %s' % (task, self.rqdata.get_user_idstring(task), str(self.rqdata.runq_revdeps[task]))) - if len(self.rqdata.runq_revdeps[task]) > 0 and self.rqdata.runq_revdeps[task].issubset(self.rq.scenequeue_covered): + if len(self.rqdata.runq_revdeps[task]) > 0 and self.rqdata.runq_revdeps[task].issubset(self.rq.scenequeue_covered) and task not in self.rq.scenequeue_notcovered: ok = True for revdep in self.rqdata.runq_revdeps[task]: if self.rqdata.runq_fnid[task] != self.rqdata.runq_fnid[revdep]: @@ -1646,6 +1646,9 @@ class RunQueueExecuteScenequeue(RunQueueExecute): self.rq.scenequeue_covered = set() for task in oldcovered: self.rq.scenequeue_covered.add(self.rqdata.runq_setscene[task]) + self.rq.scenequeue_notcovered = set() + for task in self.scenequeue_notcovered: + self.rq.scenequeue_notcovered.add(self.rqdata.runq_setscene[task]) logger.debug(1, 'We can skip tasks %s', sorted(self.rq.scenequeue_covered)) -- cgit v1.2.3-54-g00ecf