summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristiana Voicu <cristiana.voicu@intel.com>2013-08-27 13:27:37 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-27 11:47:35 +0100
commit1472b9ebff22e11b364bb380b44f5a7ff6667331 (patch)
tree7a405d3cc107282f634476dda3b9f8db9bb4e928
parent39052cd70370ba6447fc1bc2c0fa880ac336c2fc (diff)
downloadpoky-1472b9ebff22e11b364bb380b44f5a7ff6667331.tar.gz
bitbake: hob: fixes for image combo box
When an image from scratch is selected, and recipes parsing is canceled, the image shown by the combo box isn't correct. [YOCTO #5000] (Bitbake rev: f8166ace0bd9155199166990ce15da24eb2e793b) Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
index ca168bc49f..060fee241e 100644
--- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
+++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
@@ -496,16 +496,15 @@ class ImageConfigurationPage (HobPage):
496 cnt = cnt + 1 496 cnt = cnt + 1
497 self.image_combo.append_text(self.builder.recipe_model.__custom_image__) 497 self.image_combo.append_text(self.builder.recipe_model.__custom_image__)
498 498
499 if selected_image == self.builder.recipe_model.__custom_image__:
500 active = cnt
501
499 if self.custom_image_selected: 502 if self.custom_image_selected:
500 self.image_combo.append_text("--Separator--") 503 self.image_combo.append_text("--Separator--")
501 cnt = cnt + 1
502 self.image_combo.append_text(self.custom_image_selected) 504 self.image_combo.append_text(self.custom_image_selected)
505 cnt = cnt + 2
503 if self.custom_image_selected == selected_image: 506 if self.custom_image_selected == selected_image:
504 active = cnt 507 active = cnt
505 cnt = cnt + 1
506
507 if selected_image == self.builder.recipe_model.__custom_image__:
508 active = cnt
509 508
510 self.image_combo.set_active(active) 509 self.image_combo.set_active(active)
511 510