summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/bb/runqueue.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 18049436fd..02a9b912fa 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -2303,16 +2303,22 @@ class RunQueueExecute:
2303 for tid in changed: 2303 for tid in changed:
2304 if tid not in self.rqdata.runq_setscene_tids: 2304 if tid not in self.rqdata.runq_setscene_tids:
2305 continue 2305 continue
2306 if tid not in self.pending_migrations:
2307 self.pending_migrations.add(tid)
2308
2309 for tid in self.pending_migrations.copy():
2306 if tid in self.runq_running: 2310 if tid in self.runq_running:
2311 # Too late, task already running, not much we can do now
2312 self.pending_migrations.remove(tid)
2307 continue 2313 continue
2308 if tid in self.scenequeue_covered: 2314
2315 if tid in self.scenequeue_covered or tid in self.sq_live:
2316 # Already ran this setscene task or it running
2309 # Potentially risky, should we report this hash as a match? 2317 # Potentially risky, should we report this hash as a match?
2310 logger.info("Already covered setscene for %s so ignoring rehash" % (tid)) 2318 logger.info("Already covered setscene for %s so ignoring rehash" % (tid))
2319 self.pending_migrations.remove(tid)
2311 continue 2320 continue
2312 if tid not in self.pending_migrations:
2313 self.pending_migrations.add(tid)
2314 2321
2315 for tid in self.pending_migrations.copy():
2316 valid = True 2322 valid = True
2317 # Check no tasks this covers are running 2323 # Check no tasks this covers are running
2318 for dep in self.sqdata.sq_covered_tasks[tid]: 2324 for dep in self.sqdata.sq_covered_tasks[tid]: