diff options
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 4 | ||||
-rw-r--r-- | bitbake/lib/bb/tests/runqueue.py | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 02160ef4d7..65169931f1 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -2301,6 +2301,10 @@ class RunQueueExecute: | |||
2301 | continue | 2301 | continue |
2302 | if tid in self.runq_running: | 2302 | if tid in self.runq_running: |
2303 | continue | 2303 | continue |
2304 | if tid in self.scenequeue_covered: | ||
2305 | # Potentially risky, should we report this hash as a match? | ||
2306 | logger.info("Already covered setscene for %s so ignoring rehash" % (tid)) | ||
2307 | continue | ||
2304 | if tid not in self.pending_migrations: | 2308 | if tid not in self.pending_migrations: |
2305 | self.pending_migrations.add(tid) | 2309 | self.pending_migrations.add(tid) |
2306 | 2310 | ||
diff --git a/bitbake/lib/bb/tests/runqueue.py b/bitbake/lib/bb/tests/runqueue.py index 01b992c47c..50b3392bc1 100644 --- a/bitbake/lib/bb/tests/runqueue.py +++ b/bitbake/lib/bb/tests/runqueue.py | |||
@@ -307,8 +307,5 @@ class RunQueueTests(unittest.TestCase): | |||
307 | 'e1:package_setscene'] | 307 | 'e1:package_setscene'] |
308 | self.assertEqual(set(tasks), set(expected)) | 308 | self.assertEqual(set(tasks), set(expected)) |
309 | for i in expected: | 309 | for i in expected: |
310 | if i in ["e1:package_setscene"]: | 310 | self.assertEqual(tasks.count(i), 1, "%s not in task list once" % i) |
311 | self.assertEqual(tasks.count(i), 4, "%s not in task list four times" % i) | ||
312 | else: | ||
313 | self.assertEqual(tasks.count(i), 1, "%s not in task list once" % i) | ||
314 | 311 | ||