summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/bb/runqueue.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index a23f7a8918..0d89740b9a 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -2254,10 +2254,12 @@ class RunQueueExecute:
2254 2254
2255 # No more tasks can be run. If we have deferred setscene tasks we should run them. 2255 # No more tasks can be run. If we have deferred setscene tasks we should run them.
2256 if self.sq_deferred: 2256 if self.sq_deferred:
2257 tid = self.sq_deferred.pop(list(self.sq_deferred.keys())[0]) 2257 deferred_tid = list(self.sq_deferred.keys())[0]
2258 logger.warning("Runqeueue deadlocked on deferred tasks, forcing task %s" % tid) 2258 blocking_tid = self.sq_deferred.pop(deferred_tid)
2259 if tid not in self.runq_complete: 2259 logger.warning("Runqeueue deadlocked on deferred tasks, forcing task %s blocked by %s" % (deferred_tid, blocking_tid))
2260 self.sq_task_failoutright(tid) 2260 if blocking_tid not in self.runq_complete:
2261 logger.warning("Failing blocking task %s" % (blocking_tid))
2262 self.sq_task_failoutright(blocking_tid)
2261 return True 2263 return True
2262 2264
2263 if self.failed_tids: 2265 if self.failed_tids: