From cc443b593c5187926092fe4638d77dad11dcdf67 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 11 Sep 2012 17:51:59 +0100 Subject: [PATCH] bitbake: hob: don't reorder layers list We cannot reorder this list - it must stay in the order shown in the dialog (which may in future be configurable by the user). Fixes [YOCTO #2649]. (Bitbake rev: eca0352195d2d8ae8ef15baab9737884ec674a46) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/hig.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/bitbake/lib/bb/ui/crumbs/hig.py b/bitbake/lib/bb/ui/crumbs/hig.py index 3695fa0..d41a6b5 100644 --- a/bitbake/lib/bb/ui/crumbs/hig.py +++ b/bitbake/lib/bb/ui/crumbs/hig.py @@ -1029,14 +1029,8 @@ class LayerSelectionDialog (CrumbsDialog): table_layer.attach(scroll, 0, 10, 0, 1) layer_store = gtk.ListStore(gobject.TYPE_STRING) - core_iter = None for layer in layers: - if layer.endswith("/meta"): - core_iter = layer_store.prepend([layer]) - elif layer.endswith("/meta-hob") and core_iter: - layer_store.insert_after(core_iter, [layer]) - else: - layer_store.append([layer]) + layer_store.append([layer]) col1 = gtk.TreeViewColumn('Enabled') layer_tv.append_column(col1) @@ -1110,10 +1104,7 @@ class LayerSelectionDialog (CrumbsDialog): layers.append(model.get_value(it, 0)) it = model.iter_next(it) - orig_layers = sorted(self.layers) - layers.sort() - - self.layers_changed = (orig_layers != layers) + self.layers_changed = (self.layers != layers) self.layers = layers """ -- 2.7.4