summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShane Wang <shane.wang@intel.com>2012-04-15 02:58:59 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-14 23:48:48 +0100
commit9ff001cba1196b91be16ff9290919de820a2d44c (patch)
tree69b672308b5c679f12253e67a701e71275b0717d
parent62c908c88b342370d2e179953c9e07094a6060b5 (diff)
downloadpoky-9ff001cba1196b91be16ff9290919de820a2d44c.tar.gz
Hob: reset user recipe selection and package selection after settings are changed
Reset user recipe list and package list after the user changes the settings and triggers recipe reparsing. This is to continue to fix the bug [Yocto #2255] [Yocto #2255] (Bitbake rev: 95f4e9dc351f67442844ff52f90fc154fa95ba95) Signed-off-by: Shane Wang <shane.wang@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builder.py12
-rw-r--r--bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py4
2 files changed, 9 insertions, 7 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index 5dd2b13a50..48053b35c5 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -60,9 +60,7 @@ class Configuration:
60 # bblayers.conf 60 # bblayers.conf
61 self.layers = [] 61 self.layers = []
62 # image/recipes/packages 62 # image/recipes/packages
63 self.selected_image = None 63 self.clear_selection()
64 self.selected_recipes = []
65 self.selected_packages = []
66 64
67 self.user_selected_packages = [] 65 self.user_selected_packages = []
68 66
@@ -73,6 +71,11 @@ class Configuration:
73 self.git_proxy_host = self.git_proxy_port = "" 71 self.git_proxy_host = self.git_proxy_port = ""
74 self.cvs_proxy_host = self.cvs_proxy_port = "" 72 self.cvs_proxy_host = self.cvs_proxy_port = ""
75 73
74 def clear_selection(self):
75 self.selected_image = None
76 self.selected_recipes = []
77 self.selected_packages = []
78
76 def update(self, params): 79 def update(self, params):
77 # settings 80 # settings
78 self.curr_distro = params["distro"] 81 self.curr_distro = params["distro"]
@@ -988,10 +991,11 @@ class Builder(gtk.Window):
988 return response == gtk.RESPONSE_YES, settings_changed 991 return response == gtk.RESPONSE_YES, settings_changed
989 992
990 def reparse_post_adv_settings(self): 993 def reparse_post_adv_settings(self):
991 # DO reparse recipes
992 if not self.configuration.curr_mach: 994 if not self.configuration.curr_mach:
993 self.update_config_async() 995 self.update_config_async()
994 else: 996 else:
997 self.configuration.clear_selection()
998 # DO reparse recipes
995 self.populate_recipe_package_info_async() 999 self.populate_recipe_package_info_async()
996 1000
997 def deploy_image(self, image_name): 1001 def deploy_image(self, image_name):
diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
index 64c512d502..0463ee8564 100644
--- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
+++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
@@ -264,9 +264,7 @@ class ImageConfigurationPage (HobPage):
264 264
265 self.builder.configuration.curr_mach = combo_item 265 self.builder.configuration.curr_mach = combo_item
266 if self.machine_combo_changed_by_manual: 266 if self.machine_combo_changed_by_manual:
267 self.builder.configuration.selected_image = None 267 self.builder.configuration.clear_selection()
268 self.builder.configuration.selected_recipes = []
269 self.builder.configuration.selected_packages = []
270 # reset machine_combo_changed_by_manual 268 # reset machine_combo_changed_by_manual
271 self.machine_combo_changed_by_manual = True 269 self.machine_combo_changed_by_manual = True
272 270