diff options
author | Dongxiao Xu <dongxiao.xu@intel.com> | 2012-05-22 11:08:35 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-22 14:56:16 +0100 |
commit | 5c880fb3018629c00783a9869bc48685d23b58b8 (patch) | |
tree | 10043170bd42543d0c5027df5ccce1a8fe93880d /bitbake/lib/bb/ui | |
parent | 7690c45c711853c8df64b338847263488c56fcae (diff) | |
download | 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>
Diffstat (limited to 'bitbake/lib/bb/ui')
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builder.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py | 5 |
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 299981c3bb..18191df8dd 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): | |||
763 | selected_packages = self.configuration.selected_packages[:] | 763 | selected_packages = self.configuration.selected_packages[:] |
764 | 764 | ||
765 | self.image_configuration_page.update_image_combo(self.recipe_model, selected_image) | 765 | self.image_configuration_page.update_image_combo(self.recipe_model, selected_image) |
766 | self.image_configuration_page.update_image_desc(selected_image) | 766 | self.image_configuration_page.update_image_desc() |
767 | self.update_recipe_model(selected_image, selected_recipes) | 767 | self.update_recipe_model(selected_image, selected_recipes) |
768 | self.update_package_model(selected_packages) | 768 | self.update_package_model(selected_packages) |
769 | 769 | ||
diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py index 20a398cf50..c33474bb95 100644 --- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py +++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py | |||
@@ -292,8 +292,9 @@ class ImageConfigurationPage (HobPage): | |||
292 | active += 1 | 292 | active += 1 |
293 | self.machine_combo.set_active(-1) | 293 | self.machine_combo.set_active(-1) |
294 | 294 | ||
295 | def update_image_desc(self, selected_image): | 295 | def update_image_desc(self): |
296 | desc = "" | 296 | desc = "" |
297 | selected_image = self.image_combo.get_active_text() | ||
297 | if selected_image and selected_image in self.builder.recipe_model.pn_path.keys(): | 298 | if selected_image and selected_image in self.builder.recipe_model.pn_path.keys(): |
298 | image_path = self.builder.recipe_model.pn_path[selected_image] | 299 | image_path = self.builder.recipe_model.pn_path[selected_image] |
299 | image_iter = self.builder.recipe_model.get_iter(image_path) | 300 | image_iter = self.builder.recipe_model.get_iter(image_path) |
@@ -320,7 +321,7 @@ class ImageConfigurationPage (HobPage): | |||
320 | image_path = self.builder.recipe_model.pn_path[selected_image] | 321 | image_path = self.builder.recipe_model.pn_path[selected_image] |
321 | image_iter = self.builder.recipe_model.get_iter(image_path) | 322 | image_iter = self.builder.recipe_model.get_iter(image_path) |
322 | selected_packages = self.builder.recipe_model.get_value(image_iter, self.builder.recipe_model.COL_INSTALL).split() | 323 | selected_packages = self.builder.recipe_model.get_value(image_iter, self.builder.recipe_model.COL_INSTALL).split() |
323 | self.update_image_desc(selected_image) | 324 | self.update_image_desc() |
324 | 325 | ||
325 | self.builder.recipe_model.reset() | 326 | self.builder.recipe_model.reset() |
326 | self.builder.package_model.reset() | 327 | self.builder.package_model.reset() |