diff options
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 873f384ec4..8ecf166c00 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -2237,10 +2237,12 @@ class RunQueueExecute: | |||
2237 | 2237 | ||
2238 | # No more tasks can be run. If we have deferred setscene tasks we should run them. | 2238 | # No more tasks can be run. If we have deferred setscene tasks we should run them. |
2239 | if self.sq_deferred: | 2239 | if self.sq_deferred: |
2240 | tid = self.sq_deferred.pop(list(self.sq_deferred.keys())[0]) | 2240 | deferred_tid = list(self.sq_deferred.keys())[0] |
2241 | logger.warning("Runqeueue deadlocked on deferred tasks, forcing task %s" % tid) | 2241 | blocking_tid = self.sq_deferred.pop(deferred_tid) |
2242 | if tid not in self.runq_complete: | 2242 | logger.warning("Runqeueue deadlocked on deferred tasks, forcing task %s blocked by %s" % (deferred_tid, blocking_tid)) |
2243 | self.sq_task_failoutright(tid) | 2243 | if blocking_tid not in self.runq_complete: |
2244 | logger.warning("Failing blocking task %s" % (blocking_tid)) | ||
2245 | self.sq_task_failoutright(blocking_tid) | ||
2244 | return True | 2246 | return True |
2245 | 2247 | ||
2246 | if self.failed_tids: | 2248 | if self.failed_tids: |