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 | |
parent | 1db9ee5e8d472898b32e7c060d8bf276016bcee9 (diff) | |
download | poky-96ec9f8a60b2c8d480e052039e1b14a57131fd4f.tar.gz |
bitbake/cooker.py: Allow idle handlers to pass through a true value
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-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: | |||
690 | bb.event.fire(bb.event.BuildCompleted(buildname, item, failures), self.configuration.event_data) | 690 | bb.event.fire(bb.event.BuildCompleted(buildname, item, failures), self.configuration.event_data) |
691 | self.command.finishAsyncCommand() | 691 | self.command.finishAsyncCommand() |
692 | return False | 692 | return False |
693 | if retval is True: | ||
694 | return True | ||
693 | return 0.5 | 695 | return 0.5 |
694 | 696 | ||
695 | self.server.register_idle_function(buildFileIdle, rq) | 697 | self.server.register_idle_function(buildFileIdle, rq) |
@@ -709,7 +711,6 @@ class BBCooker: | |||
709 | targets = self.checkPackages(targets) | 711 | targets = self.checkPackages(targets) |
710 | 712 | ||
711 | def buildTargetsIdle(server, rq, abort): | 713 | def buildTargetsIdle(server, rq, abort): |
712 | |||
713 | if abort or self.cookerAction == cookerStop: | 714 | if abort or self.cookerAction == cookerStop: |
714 | rq.finish_runqueue(True) | 715 | rq.finish_runqueue(True) |
715 | elif self.cookerAction == cookerShutdown: | 716 | elif self.cookerAction == cookerShutdown: |
@@ -726,6 +727,8 @@ class BBCooker: | |||
726 | bb.event.fire(bb.event.BuildCompleted(buildname, targets, failures), self.configuration.event_data) | 727 | bb.event.fire(bb.event.BuildCompleted(buildname, targets, failures), self.configuration.event_data) |
727 | self.command.finishAsyncCommand() | 728 | self.command.finishAsyncCommand() |
728 | return None | 729 | return None |
730 | if retval is True: | ||
731 | return True | ||
729 | return 0.5 | 732 | return 0.5 |
730 | 733 | ||
731 | self.buildSetVars() | 734 | 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: | |||
854 | (if the abort on failure configuration option isn't set) | 854 | (if the abort on failure configuration option isn't set) |
855 | """ | 855 | """ |
856 | 856 | ||
857 | retval = 0.5 | ||
858 | |||
857 | if self.state is runQueuePrepare: | 859 | if self.state is runQueuePrepare: |
858 | self.rqdata.prepare() | 860 | self.rqdata.prepare() |
859 | self.state = runQueueRunInit | 861 | self.state = runQueueRunInit |
@@ -885,7 +887,7 @@ class RunQueue: | |||
885 | return False | 887 | return False |
886 | 888 | ||
887 | # Loop | 889 | # Loop |
888 | return True | 890 | return retval |
889 | 891 | ||
890 | def execute_runqueue_initVars(self): | 892 | def execute_runqueue_initVars(self): |
891 | 893 | ||