diff options
| author |   Shane Wang <shane.wang@intel.com> | 2012-04-15 02:58:59 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-14 23:48:36 +0100 |
| commit | 95f4e9dc351f67442844ff52f90fc154fa95ba95 (patch) | |
| tree | 785d9f3bda7c1162e802b0f3158bd57e045e33d8 /lib | |
| parent | f7c874ab930b9e7f95e79d0e84e62eb9b967f566 (diff) | |
| download | bitbake-contrib-95f4e9dc351f67442844ff52f90fc154fa95ba95.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]
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/bb/ui/crumbs/builder.py | 12 | ||||
| -rw-r--r-- | lib/bb/ui/crumbs/imageconfigurationpage.py | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/lib/bb/ui/crumbs/builder.py b/lib/bb/ui/crumbs/builder.py index 5dd2b13a5..48053b35c 100755 --- a/lib/bb/ui/crumbs/builder.py +++ b/lib/bb/ui/crumbs/builder.py @@ -60,9 +60,7 @@ class Configuration: # bblayers.conf self.layers = [] # image/recipes/packages - self.selected_image = None - self.selected_recipes = [] - self.selected_packages = [] + self.clear_selection() self.user_selected_packages = [] @@ -73,6 +71,11 @@ class Configuration: self.git_proxy_host = self.git_proxy_port = "" self.cvs_proxy_host = self.cvs_proxy_port = "" + def clear_selection(self): + self.selected_image = None + self.selected_recipes = [] + self.selected_packages = [] + def update(self, params): # settings self.curr_distro = params["distro"] @@ -988,10 +991,11 @@ class Builder(gtk.Window): return response == gtk.RESPONSE_YES, settings_changed def reparse_post_adv_settings(self): - # DO reparse recipes if not self.configuration.curr_mach: self.update_config_async() else: + self.configuration.clear_selection() + # DO reparse recipes self.populate_recipe_package_info_async() def deploy_image(self, image_name): diff --git a/lib/bb/ui/crumbs/imageconfigurationpage.py b/lib/bb/ui/crumbs/imageconfigurationpage.py index 64c512d50..0463ee856 100644 --- a/lib/bb/ui/crumbs/imageconfigurationpage.py +++ b/lib/bb/ui/crumbs/imageconfigurationpage.py @@ -264,9 +264,7 @@ class ImageConfigurationPage (HobPage): self.builder.configuration.curr_mach = combo_item if self.machine_combo_changed_by_manual: - self.builder.configuration.selected_image = None - self.builder.configuration.selected_recipes = [] - self.builder.configuration.selected_packages = [] + self.builder.configuration.clear_selection() # reset machine_combo_changed_by_manual self.machine_combo_changed_by_manual = True |