summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/runqueue.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 56ca2529ca..6e3a91b850 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -1708,6 +1708,7 @@ class RunQueueExecute:
1708 self.runq_buildable = set() 1708 self.runq_buildable = set()
1709 self.runq_running = set() 1709 self.runq_running = set()
1710 self.runq_complete = set() 1710 self.runq_complete = set()
1711 self.runq_tasksrun = set()
1711 1712
1712 self.build_stamps = {} 1713 self.build_stamps = {}
1713 self.build_stamps2 = [] 1714 self.build_stamps2 = []
@@ -1893,6 +1894,7 @@ class RunQueueExecute:
1893 self.stats.taskCompleted() 1894 self.stats.taskCompleted()
1894 bb.event.fire(runQueueTaskCompleted(task, self.stats, self.rq), self.cfgData) 1895 bb.event.fire(runQueueTaskCompleted(task, self.stats, self.rq), self.cfgData)
1895 self.task_completeoutright(task) 1896 self.task_completeoutright(task)
1897 self.runq_tasksrun.add(task)
1896 1898
1897 def task_fail(self, task, exitcode): 1899 def task_fail(self, task, exitcode):
1898 """ 1900 """
@@ -2092,6 +2094,7 @@ class RunQueueExecute:
2092 logger.debug(2, "Stamp current task %s", task) 2094 logger.debug(2, "Stamp current task %s", task)
2093 2095
2094 self.task_skip(task, "existing") 2096 self.task_skip(task, "existing")
2097 self.runq_tasksrun.add(task)
2095 return True 2098 return True
2096 2099
2097 taskdep = self.rqdata.dataCaches[mc].task_deps[taskfn] 2100 taskdep = self.rqdata.dataCaches[mc].task_deps[taskfn]
@@ -2353,7 +2356,7 @@ class RunQueueExecute:
2353 if tid in self.tasks_scenequeue_done: 2356 if tid in self.tasks_scenequeue_done:
2354 self.tasks_scenequeue_done.remove(tid) 2357 self.tasks_scenequeue_done.remove(tid)
2355 for dep in self.sqdata.sq_covered_tasks[tid]: 2358 for dep in self.sqdata.sq_covered_tasks[tid]:
2356 if dep in self.runq_complete: 2359 if dep in self.runq_complete and dep not in self.runq_tasksrun:
2357 bb.error("Task %s marked as completed but now needing to rerun? Aborting build." % dep) 2360 bb.error("Task %s marked as completed but now needing to rerun? Aborting build." % dep)
2358 self.failed_tids.append(tid) 2361 self.failed_tids.append(tid)
2359 self.rq.state = runQueueCleanUp 2362 self.rq.state = runQueueCleanUp