diff options
| author |   Richard Purdie <rpurdie@linux.intel.com> | 2010-08-18 17:37:15 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-19 11:41:44 +0100 |
| commit | 96ec9f8a60b2c8d480e052039e1b14a57131fd4f (patch) | |
| tree | f7191e17ecd5fc5d8e755fd0b51647247cac1120 /bitbake | |
| parent | 1db9ee5e8d472898b32e7c060d8bf276016bcee9 (diff) | |
| download | openembedded-core-96ec9f8a60b2c8d480e052039e1b14a57131fd4f.tar.gz | |
bitbake/cooker.py: Allow idle handlers to pass through a true value
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 5 | ||||
| -rw-r--r-- | bitbake/lib/bb/runqueue.py | 4 |
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): |