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>
This commit is contained in:
Shane Wang 2012-04-15 02:58:59 +08:00 committed by Richard Purdie
parent 62c908c88b
commit 9ff001cba1
2 changed files with 9 additions and 7 deletions

View File

@ -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):

View File

@ -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