summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2012-05-22 11:08:35 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-22 14:56:16 +0100
commit5c880fb3018629c00783a9869bc48685d23b58b8 (patch)
tree10043170bd42543d0c5027df5ccce1a8fe93880d
parent7690c45c711853c8df64b338847263488c56fcae (diff)
downloadast2050-yocto-poky-5c880fb3018629c00783a9869bc48685d23b58b8.zip
ast2050-yocto-poky-5c880fb3018629c00783a9869bc48685d23b58b8.tar.gz
Hob: Get image name internally when updating the image description
The image name shouldn't be passed from outside caller, since the image name may not in the combobox list. Getting the name from update_image_desc() internally. (Bitbake rev: 6635cd7bc2a448d1324e9344100f97613f4272b5) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builder.py2
-rw-r--r--bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py5
2 files changed, 4 insertions, 3 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index 299981c..18191df 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -763,7 +763,7 @@ class Builder(gtk.Window):
selected_packages = self.configuration.selected_packages[:]
self.image_configuration_page.update_image_combo(self.recipe_model, selected_image)
- self.image_configuration_page.update_image_desc(selected_image)
+ self.image_configuration_page.update_image_desc()
self.update_recipe_model(selected_image, selected_recipes)
self.update_package_model(selected_packages)
diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
index 20a398c..c33474b 100644
--- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
+++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
@@ -292,8 +292,9 @@ class ImageConfigurationPage (HobPage):
active += 1
self.machine_combo.set_active(-1)
- def update_image_desc(self, selected_image):
+ def update_image_desc(self):
desc = ""
+ selected_image = self.image_combo.get_active_text()
if selected_image and selected_image in self.builder.recipe_model.pn_path.keys():
image_path = self.builder.recipe_model.pn_path[selected_image]
image_iter = self.builder.recipe_model.get_iter(image_path)
@@ -320,7 +321,7 @@ class ImageConfigurationPage (HobPage):
image_path = self.builder.recipe_model.pn_path[selected_image]
image_iter = self.builder.recipe_model.get_iter(image_path)
selected_packages = self.builder.recipe_model.get_value(image_iter, self.builder.recipe_model.COL_INSTALL).split()
- self.update_image_desc(selected_image)
+ self.update_image_desc()
self.builder.recipe_model.reset()
self.builder.package_model.reset()
OpenPOWER on IntegriCloud