diff options
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
-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 feb42d3e6b..78e576eb2c 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -2030,8 +2030,6 @@ class RunQueueExecute: | |||
2030 | logger.debug("%s didn't become valid, skipping setscene" % nexttask) | 2030 | logger.debug("%s didn't become valid, skipping setscene" % nexttask) |
2031 | self.sq_task_failoutright(nexttask) | 2031 | self.sq_task_failoutright(nexttask) |
2032 | return True | 2032 | return True |
2033 | else: | ||
2034 | self.sqdata.outrightfail.remove(nexttask) | ||
2035 | if nexttask in self.sqdata.outrightfail: | 2033 | if nexttask in self.sqdata.outrightfail: |
2036 | logger.debug2('No package found, so skipping setscene task %s', nexttask) | 2034 | logger.debug2('No package found, so skipping setscene task %s', nexttask) |
2037 | self.sq_task_failoutright(nexttask) | 2035 | self.sq_task_failoutright(nexttask) |
@@ -2827,6 +2825,8 @@ def update_scenequeue_data(tids, sqdata, rqdata, rq, cooker, stampcache, sqrq, s | |||
2827 | sqdata.stamppresent.remove(tid) | 2825 | sqdata.stamppresent.remove(tid) |
2828 | if tid in sqdata.valid: | 2826 | if tid in sqdata.valid: |
2829 | sqdata.valid.remove(tid) | 2827 | sqdata.valid.remove(tid) |
2828 | if tid in sqdata.outrightfail: | ||
2829 | sqdata.outrightfail.remove(tid) | ||
2830 | 2830 | ||
2831 | noexec, stamppresent = check_setscene_stamps(tid, rqdata, rq, stampcache, noexecstamp=True) | 2831 | noexec, stamppresent = check_setscene_stamps(tid, rqdata, rq, stampcache, noexecstamp=True) |
2832 | 2832 | ||
@@ -2861,10 +2861,10 @@ def update_scenequeue_data(tids, sqdata, rqdata, rq, cooker, stampcache, sqrq, s | |||
2861 | if tid in sqrq.scenequeue_covered: | 2861 | if tid in sqrq.scenequeue_covered: |
2862 | continue | 2862 | continue |
2863 | 2863 | ||
2864 | sqdata.outrightfail.add(tid) | ||
2865 | |||
2866 | h = pending_hash_index(tid, rqdata) | 2864 | h = pending_hash_index(tid, rqdata) |
2867 | if h not in sqdata.hashes: | 2865 | if h not in sqdata.hashes: |
2866 | if tid in tids: | ||
2867 | sqdata.outrightfail.add(tid) | ||
2868 | sqdata.hashes[h] = tid | 2868 | sqdata.hashes[h] = tid |
2869 | else: | 2869 | else: |
2870 | sqrq.sq_deferred[tid] = sqdata.hashes[h] | 2870 | sqrq.sq_deferred[tid] = sqdata.hashes[h] |