summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristiana Voicu <cristiana.voicu@intel.com>2012-09-10 15:49:57 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-10 21:54:45 +0100
commit2cbf4e60a3ce9ea4a5a02a7ab67050d68163f469 (patch)
tree8c0ebc894a096c20d7eb4e1a52d6b149339256b7
parent1b1b83651af33ffcb204031e2790719e3b0b45bb (diff)
downloadpoky-2cbf4e60a3ce9ea4a5a02a7ab67050d68163f469.tar.gz
bitbake: hob/packageselectionpage: restore selected packages
After "Cancel" action, selected packages are restored to default. [YOCTO #2984] (Bitbake rev: 81b0c0cd15cbd61285e6525f482412051371ea4c) Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builder.py2
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/packageselectionpage.py5
2 files changed, 3 insertions, 4 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index a203a06e59..4440d295a3 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -652,6 +652,7 @@ class Builder(gtk.Window):
652 self.recipe_details_page.set_recipe_curr_tab(self.recipe_details_page.INCLUDED) 652 self.recipe_details_page.set_recipe_curr_tab(self.recipe_details_page.INCLUDED)
653 653
654 elif next_step == self.PACKAGE_SELECTION: 654 elif next_step == self.PACKAGE_SELECTION:
655 self.configuration.initial_selected_packages = self.configuration.selected_packages
655 if self.recipe_model.get_selected_image() == self.recipe_model.__custom_image__: 656 if self.recipe_model.get_selected_image() == self.recipe_model.__custom_image__:
656 self.package_details_page.set_packages_curr_tab(self.package_details_page.ALL) 657 self.package_details_page.set_packages_curr_tab(self.package_details_page.ALL)
657 else: 658 else:
@@ -664,7 +665,6 @@ class Builder(gtk.Window):
664 self.build_details_page.show_page(next_step) 665 self.build_details_page.show_page(next_step)
665 666
666 elif next_step == self.PACKAGE_GENERATED: 667 elif next_step == self.PACKAGE_GENERATED:
667 self.configuration.initial_selected_packages = self.configuration.selected_packages
668 if self.recipe_model.get_selected_image() == self.recipe_model.__custom_image__: 668 if self.recipe_model.get_selected_image() == self.recipe_model.__custom_image__:
669 self.package_details_page.set_packages_curr_tab(self.package_details_page.ALL) 669 self.package_details_page.set_packages_curr_tab(self.package_details_page.ALL)
670 else: 670 else:
diff --git a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py
index c73697bb33..e3d35effe4 100755
--- a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py
+++ b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py
@@ -187,12 +187,11 @@ class PackageSelectionPage (HobPage):
187 self.builder.build_image() 187 self.builder.build_image()
188 188
189 def back_button_clicked_cb(self, button): 189 def back_button_clicked_cb(self, button):
190 self.builder.restore_initial_selected_packages()
191 self.refresh_selection()
192
193 if self.builder.current_step == self.builder.PACKAGE_GENERATED: 190 if self.builder.current_step == self.builder.PACKAGE_GENERATED:
194 self.builder.show_recipes() 191 self.builder.show_recipes()
195 elif self.builder.previous_step == self.builder.IMAGE_GENERATED: 192 elif self.builder.previous_step == self.builder.IMAGE_GENERATED:
193 self.builder.restore_initial_selected_packages()
194 self.refresh_selection()
196 self.builder.show_image_details() 195 self.builder.show_image_details()
197 196
198 def _expand_all(self): 197 def _expand_all(self):