summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2011-07-26 17:44:34 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-27 16:54:04 +0100
commitb004d8ef0f06cbf302a55b73b20b7ee7dac645f7 (patch)
treec6b2d4754452d43abcb469b443d5c0f428cd57a1 /bitbake
parent6b109860bfa093b7f1fe7ddae2e60595d070735b (diff)
downloadpoky-b004d8ef0f06cbf302a55b73b20b7ee7dac645f7.tar.gz
hob: fix loading customised image recipe
The signal handler of the 'Base image' combo was still connected during load such that updating the UI to reflect the loaded base image triggered a change of the model. Fix this by disconnecting the signal handler when updating the displayed 'Base image'. Fixes [YOCTO #1282] (Bitbake rev: 58036a79cb79d1dff307e2cfed0e684493178507) Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/ui/crumbs/tasklistmodel.py2
-rw-r--r--bitbake/lib/bb/ui/hob.py6
2 files changed, 7 insertions, 1 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/tasklistmodel.py b/bitbake/lib/bb/ui/crumbs/tasklistmodel.py
index d7dff3c053..e190f969a4 100644
--- a/bitbake/lib/bb/ui/crumbs/tasklistmodel.py
+++ b/bitbake/lib/bb/ui/crumbs/tasklistmodel.py
@@ -281,7 +281,7 @@ class TaskListModel(gtk.ListStore):
281 path = self.get_path(it) 281 path = self.get_path(it)
282 name = self[path][self.COL_NAME] 282 name = self[path][self.COL_NAME]
283 if name in packages: 283 if name in packages:
284 self.include_item(path) 284 self.include_item(path, binb="User Selected")
285 packages.remove(name) 285 packages.remove(name)
286 it = self.iter_next(it) 286 it = self.iter_next(it)
287 287
diff --git a/bitbake/lib/bb/ui/hob.py b/bitbake/lib/bb/ui/hob.py
index d3442c518c..90d5c5aa90 100644
--- a/bitbake/lib/bb/ui/hob.py
+++ b/bitbake/lib/bb/ui/hob.py
@@ -122,6 +122,10 @@ class MainWindow (gtk.Window):
122 self.build_succeeded = False 122 self.build_succeeded = False
123 123
124 def image_changed_string_cb(self, model, new_image): 124 def image_changed_string_cb(self, model, new_image):
125 # disconnect the image combo's signal handler
126 if self.image_combo_id:
127 self.image_combo.disconnect(self.image_combo_id)
128 self.image_combo_id = None
125 cnt = 0 129 cnt = 0
126 it = self.model.images.get_iter_first() 130 it = self.model.images.get_iter_first()
127 while it: 131 while it:
@@ -131,6 +135,8 @@ class MainWindow (gtk.Window):
131 break 135 break
132 it = self.model.images.iter_next(it) 136 it = self.model.images.iter_next(it)
133 cnt = cnt + 1 137 cnt = cnt + 1
138 # Reconnect the signal handler
139 self.image_combo_id = self.image_combo.connect("changed", self.image_changed_cb)
134 140
135 def image_changed_cb(self, combo): 141 def image_changed_cb(self, combo):
136 model = self.image_combo.get_model() 142 model = self.image_combo.get_model()