|
@@ -1831,13 +1831,14 @@ class RunQueueExecuteTasks(RunQueueExecute):
|
|
|
bb.build.del_stamp(taskname, self.rqdata.dataCaches[mc], taskfn)
|
|
|
self.rq.scenequeue_covered.remove(tid)
|
|
|
|
|
|
- toremove = covered_remove
|
|
|
+ toremove = covered_remove | self.rq.scenequeue_notcovered
|
|
|
for task in toremove:
|
|
|
logger.debug(1, 'Not skipping task %s due to setsceneverify', task)
|
|
|
while toremove:
|
|
|
covered_remove = []
|
|
|
for task in toremove:
|
|
|
- removecoveredtask(task)
|
|
|
+ if task in self.rq.scenequeue_covered:
|
|
|
+ removecoveredtask(task)
|
|
|
for deptask in self.rqdata.runtaskentries[task].depends:
|
|
|
if deptask not in self.rq.scenequeue_covered:
|
|
|
continue
|
|
@@ -2103,6 +2104,7 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
|
|
|
# If we don't have any setscene functions, skip this step
|
|
|
if len(self.rqdata.runq_setscene_tids) == 0:
|
|
|
rq.scenequeue_covered = set()
|
|
|
+ rq.scenequeue_notcovered = set()
|
|
|
rq.state = runQueueRunInit
|
|
|
return
|
|
|
|