diff options
author | Dongxiao Xu <dongxiao.xu@intel.com> | 2012-04-15 15:26:37 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-15 17:31:57 +0100 |
commit | 74211e0372da92bd6b8600bee9e5624f044127a6 (patch) | |
tree | 79526597accae1f9c046d51f6d7c1f8c9427afdb /bitbake/lib/bb/ui/crumbs/builder.py | |
parent | a5210e47b08e0ee42e9e188d83953203147a994d (diff) | |
download | poky-74211e0372da92bd6b8600bee9e5624f044127a6.tar.gz |
Hob: Handle NoProvider event in runningbuild module
If NoProvider event is received, we will handle it in runningbuild
module and send notification to Hob instance, avoiding stepping into the
final page with no image built out.
This fixes [YOCTO #2249]
(Bitbake rev: 067bc46a0fbc542fef1fcaa406ad3737a4c5a55a)
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs/builder.py')
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builder.py | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index 48053b35c5..dd59d59d10 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py | |||
@@ -349,6 +349,7 @@ class Builder(gtk.Window): | |||
349 | self.handler.build.connect("build-failed", self.handler_build_failed_cb) | 349 | self.handler.build.connect("build-failed", self.handler_build_failed_cb) |
350 | self.handler.build.connect("task-started", self.handler_task_started_cb) | 350 | self.handler.build.connect("task-started", self.handler_task_started_cb) |
351 | self.handler.build.connect("log-error", self.handler_build_failure_cb) | 351 | self.handler.build.connect("log-error", self.handler_build_failure_cb) |
352 | self.handler.build.connect("no-provider", self.handler_no_provider_cb) | ||
352 | self.handler.connect("generating-data", self.handler_generating_data_cb) | 353 | self.handler.connect("generating-data", self.handler_generating_data_cb) |
353 | self.handler.connect("data-generated", self.handler_data_generated_cb) | 354 | self.handler.connect("data-generated", self.handler_data_generated_cb) |
354 | self.handler.connect("command-succeeded", self.handler_command_succeeded_cb) | 355 | self.handler.connect("command-succeeded", self.handler_command_succeeded_cb) |
@@ -624,10 +625,6 @@ class Builder(gtk.Window): | |||
624 | self.rcppkglist_populated() | 625 | self.rcppkglist_populated() |
625 | if self.current_step == self.FAST_IMAGE_GENERATING: | 626 | if self.current_step == self.FAST_IMAGE_GENERATING: |
626 | self.generate_image_async() | 627 | self.generate_image_async() |
627 | elif self.current_step == self.PACKAGE_GENERATING: | ||
628 | self.switch_page(self.PACKAGE_GENERATED) | ||
629 | elif self.current_step == self.IMAGE_GENERATING: | ||
630 | self.switch_page(self.IMAGE_GENERATED) | ||
631 | 628 | ||
632 | def handler_command_failed_cb(self, handler, msg): | 629 | def handler_command_failed_cb(self, handler, msg): |
633 | if msg: | 630 | if msg: |
@@ -755,6 +752,11 @@ class Builder(gtk.Window): | |||
755 | self.handler.build_succeeded_async() | 752 | self.handler.build_succeeded_async() |
756 | self.stopping = False | 753 | self.stopping = False |
757 | 754 | ||
755 | if self.current_step == self.PACKAGE_GENERATING: | ||
756 | self.switch_page(self.PACKAGE_GENERATED) | ||
757 | elif self.current_step == self.IMAGE_GENERATING: | ||
758 | self.switch_page(self.IMAGE_GENERATED) | ||
759 | |||
758 | def build_failed(self): | 760 | def build_failed(self): |
759 | if self.stopping: | 761 | if self.stopping: |
760 | status = "stop" | 762 | status = "stop" |
@@ -785,6 +787,14 @@ class Builder(gtk.Window): | |||
785 | def handler_build_failed_cb(self, running_build): | 787 | def handler_build_failed_cb(self, running_build): |
786 | self.build_failed() | 788 | self.build_failed() |
787 | 789 | ||
790 | def handler_no_provider_cb(self, running_build, msg): | ||
791 | dialog = CrumbsMessageDialog(self, msg, gtk.STOCK_DIALOG_INFO) | ||
792 | button = dialog.add_button("Close", gtk.RESPONSE_OK) | ||
793 | HobButton.style_button(button) | ||
794 | dialog.run() | ||
795 | dialog.destroy() | ||
796 | self.build_failed() | ||
797 | |||
788 | def handler_task_started_cb(self, running_build, message): | 798 | def handler_task_started_cb(self, running_build, message): |
789 | fraction = message["current"] * 1.0/message["total"] | 799 | fraction = message["current"] * 1.0/message["total"] |
790 | title = "Build packages" | 800 | title = "Build packages" |