[oe-commits] [bitbake] branch master-next updated: fixup

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository bitbake.

The following commit(s) were added to refs/heads/master-next by this push:
     new e96204a  fixup
e96204a is described below

commit e96204a429a276d44d7a6fdc8bfff4e90a28ef2a
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Thu Jul 25 09:51:34 2019 +0100

    fixup
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/runqueue.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py
index 1ac8d06..3ef976d 100644
--- a/lib/bb/runqueue.py
+++ b/lib/bb/runqueue.py
@@ -2015,7 +2015,7 @@ class RunQueueExecute:
             if self.can_start_task():
                 return True
 
-        if not self.sq_live and not self.sqdone and not self.sq_deferred and not self.changed_setscene:
+        if not self.sq_live and not self.sqdone and not self.sq_deferred and not self.changed_setscene and not self.holdoff_tasks:
             logger.info("Setscene tasks completed")
             logger.debug(1, 'We could skip tasks %s', "\n".join(sorted(self.scenequeue_covered)))
 
@@ -2268,14 +2268,7 @@ class RunQueueExecute:
             if not valid:
                 continue
 
-            if tid in self.runq_buildable:
-                self.runq_buildable.remove(tid)
-                self.sched.removebuildable(tid)
-
             for dep in self.sqdata.sq_covered_tasks[tid]:
-                if dep in self.runq_buildable and dep not in self.runq_complete:
-                    self.runq_buildable.remove(dep)
-                    self.sched.removebuildable(dep)
                 if dep not in self.runq_complete:
                     if dep in self.tasks_scenequeue_done:
                         self.tasks_scenequeue_done.remove(dep)
@@ -2396,6 +2389,7 @@ class RunQueueExecute:
                 for tid in covered:
                     if self.rqdata.runtaskentries[tid].depends.issubset(self.runq_complete):
                         self.setbuildable(tid)
+        self.update_holdofftasks()
 
     def sq_task_completeoutright(self, task):
         """

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.