diff options
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 28bdadb45e..aa1d6b2711 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -1942,6 +1942,10 @@ class RunQueueExecute: | |||
1942 | logger.error("Scenequeue had holdoff tasks: %s" % pprint.pformat(self.holdoff_tasks)) | 1942 | logger.error("Scenequeue had holdoff tasks: %s" % pprint.pformat(self.holdoff_tasks)) |
1943 | err = True | 1943 | err = True |
1944 | 1944 | ||
1945 | for tid in self.scenequeue_covered.intersection(self.scenequeue_notcovered): | ||
1946 | # No task should end up in both covered and uncovered, that is a bug. | ||
1947 | logger.error("Setscene task %s in both covered and notcovered." % tid) | ||
1948 | |||
1945 | for tid in self.rqdata.runq_setscene_tids: | 1949 | for tid in self.rqdata.runq_setscene_tids: |
1946 | if tid not in self.scenequeue_covered and tid not in self.scenequeue_notcovered: | 1950 | if tid not in self.scenequeue_covered and tid not in self.scenequeue_notcovered: |
1947 | err = True | 1951 | err = True |
@@ -2430,6 +2434,9 @@ class RunQueueExecute: | |||
2430 | 2434 | ||
2431 | for dep in sorted(self.sqdata.sq_deps[task]): | 2435 | for dep in sorted(self.sqdata.sq_deps[task]): |
2432 | if fail and task in self.sqdata.sq_harddeps and dep in self.sqdata.sq_harddeps[task]: | 2436 | if fail and task in self.sqdata.sq_harddeps and dep in self.sqdata.sq_harddeps[task]: |
2437 | if dep in self.scenequeue_covered or dep in self.scenequeue_notcovered: | ||
2438 | # dependency could be already processed, e.g. noexec setscene task | ||
2439 | continue | ||
2433 | logger.debug(2, "%s was unavailable and is a hard dependency of %s so skipping" % (task, dep)) | 2440 | logger.debug(2, "%s was unavailable and is a hard dependency of %s so skipping" % (task, dep)) |
2434 | self.sq_task_failoutright(dep) | 2441 | self.sq_task_failoutright(dep) |
2435 | continue | 2442 | continue |
@@ -2791,6 +2798,7 @@ def update_scenequeue_data(tids, sqdata, rqdata, rq, cooker, stampcache, sqrq, s | |||
2791 | sqdata.valid |= rq.validate_hashes(tocheck, cooker.data, len(sqdata.stamppresent), False, summary=summary) | 2798 | sqdata.valid |= rq.validate_hashes(tocheck, cooker.data, len(sqdata.stamppresent), False, summary=summary) |
2792 | 2799 | ||
2793 | sqdata.hashes = {} | 2800 | sqdata.hashes = {} |
2801 | sqrq.sq_deferred = {} | ||
2794 | for mc in sorted(sqdata.multiconfigs): | 2802 | for mc in sorted(sqdata.multiconfigs): |
2795 | for tid in sorted(sqdata.sq_revdeps): | 2803 | for tid in sorted(sqdata.sq_revdeps): |
2796 | if mc_from_tid(tid) != mc: | 2804 | if mc_from_tid(tid) != mc: |
@@ -2803,6 +2811,9 @@ def update_scenequeue_data(tids, sqdata, rqdata, rq, cooker, stampcache, sqrq, s | |||
2803 | continue | 2811 | continue |
2804 | if tid in sqrq.scenequeue_notcovered: | 2812 | if tid in sqrq.scenequeue_notcovered: |
2805 | continue | 2813 | continue |
2814 | if tid in sqrq.scenequeue_covered: | ||
2815 | continue | ||
2816 | |||
2806 | sqdata.outrightfail.add(tid) | 2817 | sqdata.outrightfail.add(tid) |
2807 | 2818 | ||
2808 | h = pending_hash_index(tid, rqdata) | 2819 | h = pending_hash_index(tid, rqdata) |