2 files changed, 7 insertions, 2 deletions

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 8d65ba809a..a1620b0162 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -690,6 +690,8 @@ class BBCooker:
                 bb.event.fire(bb.event.BuildCompleted(buildname, item, failures), self.configuration.event_data)
                 self.command.finishAsyncCommand()
                 return False
+            if retval is True:
+                return True
             return 0.5
 
         self.server.register_idle_function(buildFileIdle, rq)
@@ -709,7 +711,6 @@ class BBCooker:
         targets = self.checkPackages(targets)
 
         def buildTargetsIdle(server, rq, abort):
-
             if abort or self.cookerAction == cookerStop:
                 rq.finish_runqueue(True)
             elif self.cookerAction == cookerShutdown:
@@ -726,6 +727,8 @@ class BBCooker:
                 bb.event.fire(bb.event.BuildCompleted(buildname, targets, failures), self.configuration.event_data)
                 self.command.finishAsyncCommand()
                 return None
+            if retval is True:
+                return True
             return 0.5
 
         self.buildSetVars()
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 52f8554141..9f714e46ad 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -854,6 +854,8 @@ class RunQueue:
         (if the abort on failure configuration option isn't set)
         """
 
+        retval = 0.5
+
         if self.state is runQueuePrepare:
             self.rqdata.prepare()
             self.state = runQueueRunInit
@@ -885,7 +887,7 @@ class RunQueue:
             return False
 
         # Loop
-        return True
+        return retval
 
     def execute_runqueue_initVars(self):