diff options
| author |   Cristiana Voicu <cristiana.voicu@intel.com> | 2012-09-10 15:49:57 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-10 21:54:35 +0100 |
| commit | 81b0c0cd15cbd61285e6525f482412051371ea4c (patch) | |
| tree | 15013a60fc7e4ce3189a9c8c10c5462e45dbce18 /lib | |
| parent | a3bf87a90198bf6127663c27d8be086dab04aaf9 (diff) | |
| download | bitbake-81b0c0cd15cbd61285e6525f482412051371ea4c.tar.gz | |
hob/packageselectionpage: restore selected packages
After "Cancel" action, selected packages are restored to default.
[YOCTO #2984]
Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/bb/ui/crumbs/builder.py | 2 | ||||
| -rwxr-xr-x | lib/bb/ui/crumbs/packageselectionpage.py | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/bb/ui/crumbs/builder.py b/lib/bb/ui/crumbs/builder.py index a203a06e5..4440d295a 100755 --- a/lib/bb/ui/crumbs/builder.py +++ b/lib/bb/ui/crumbs/builder.py @@ -652,6 +652,7 @@ class Builder(gtk.Window): self.recipe_details_page.set_recipe_curr_tab(self.recipe_details_page.INCLUDED) elif next_step == self.PACKAGE_SELECTION: + self.configuration.initial_selected_packages = self.configuration.selected_packages if self.recipe_model.get_selected_image() == self.recipe_model.__custom_image__: self.package_details_page.set_packages_curr_tab(self.package_details_page.ALL) else: @@ -664,7 +665,6 @@ class Builder(gtk.Window): self.build_details_page.show_page(next_step) elif next_step == self.PACKAGE_GENERATED: - self.configuration.initial_selected_packages = self.configuration.selected_packages if self.recipe_model.get_selected_image() == self.recipe_model.__custom_image__: self.package_details_page.set_packages_curr_tab(self.package_details_page.ALL) else: diff --git a/lib/bb/ui/crumbs/packageselectionpage.py b/lib/bb/ui/crumbs/packageselectionpage.py index c73697bb3..e3d35effe 100755 --- a/lib/bb/ui/crumbs/packageselectionpage.py +++ b/lib/bb/ui/crumbs/packageselectionpage.py @@ -187,12 +187,11 @@ class PackageSelectionPage (HobPage): self.builder.build_image() def back_button_clicked_cb(self, button): - self.builder.restore_initial_selected_packages() - self.refresh_selection() - if self.builder.current_step == self.builder.PACKAGE_GENERATED: self.builder.show_recipes() elif self.builder.previous_step == self.builder.IMAGE_GENERATED: + self.builder.restore_initial_selected_packages() + self.refresh_selection() self.builder.show_image_details() def _expand_all(self): |