diff options
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 6cdc72a85b..f82bc41357 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -2084,8 +2084,6 @@ class RunQueueExecute: | |||
2084 | logger.debug(1, "%s didn't become valid, skipping setscene" % nexttask) | 2084 | logger.debug(1, "%s didn't become valid, skipping setscene" % nexttask) |
2085 | self.sq_task_failoutright(nexttask) | 2085 | self.sq_task_failoutright(nexttask) |
2086 | return True | 2086 | return True |
2087 | else: | ||
2088 | self.sqdata.outrightfail.remove(nexttask) | ||
2089 | if nexttask in self.sqdata.outrightfail: | 2087 | if nexttask in self.sqdata.outrightfail: |
2090 | logger.debug(2, 'No package found, so skipping setscene task %s', nexttask) | 2088 | logger.debug(2, 'No package found, so skipping setscene task %s', nexttask) |
2091 | self.sq_task_failoutright(nexttask) | 2089 | self.sq_task_failoutright(nexttask) |
@@ -2843,6 +2841,8 @@ def update_scenequeue_data(tids, sqdata, rqdata, rq, cooker, stampcache, sqrq, s | |||
2843 | sqdata.stamppresent.remove(tid) | 2841 | sqdata.stamppresent.remove(tid) |
2844 | if tid in sqdata.valid: | 2842 | if tid in sqdata.valid: |
2845 | sqdata.valid.remove(tid) | 2843 | sqdata.valid.remove(tid) |
2844 | if tid in sqdata.outrightfail: | ||
2845 | sqdata.outrightfail.remove(tid) | ||
2846 | 2846 | ||
2847 | (mc, fn, taskname, taskfn) = split_tid_mcfn(tid) | 2847 | (mc, fn, taskname, taskfn) = split_tid_mcfn(tid) |
2848 | 2848 | ||
@@ -2887,10 +2887,10 @@ def update_scenequeue_data(tids, sqdata, rqdata, rq, cooker, stampcache, sqrq, s | |||
2887 | if tid in sqrq.scenequeue_covered: | 2887 | if tid in sqrq.scenequeue_covered: |
2888 | continue | 2888 | continue |
2889 | 2889 | ||
2890 | sqdata.outrightfail.add(tid) | ||
2891 | |||
2892 | h = pending_hash_index(tid, rqdata) | 2890 | h = pending_hash_index(tid, rqdata) |
2893 | if h not in sqdata.hashes: | 2891 | if h not in sqdata.hashes: |
2892 | if tid in tids: | ||
2893 | sqdata.outrightfail.add(tid) | ||
2894 | sqdata.hashes[h] = tid | 2894 | sqdata.hashes[h] = tid |
2895 | else: | 2895 | else: |
2896 | sqrq.sq_deferred[tid] = sqdata.hashes[h] | 2896 | sqrq.sq_deferred[tid] = sqdata.hashes[h] |