diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-09-11 17:51:59 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-14 09:50:32 +0100 |
commit | beb68152261070be1587a5e94a5268088bd8263e (patch) | |
tree | ba22699aa0d5dd793712e4690a260be8b9646dc8 /bitbake | |
parent | ffc3b5ded372bdebcb610b7aac91ff56cabeddce (diff) | |
download | poky-beb68152261070be1587a5e94a5268088bd8263e.tar.gz |
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 <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/hig.py | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hig.py b/bitbake/lib/bb/ui/crumbs/hig.py index 3695fa0d54..d41a6b5bde 100644 --- a/bitbake/lib/bb/ui/crumbs/hig.py +++ b/bitbake/lib/bb/ui/crumbs/hig.py | |||
@@ -1029,14 +1029,8 @@ class LayerSelectionDialog (CrumbsDialog): | |||
1029 | table_layer.attach(scroll, 0, 10, 0, 1) | 1029 | table_layer.attach(scroll, 0, 10, 0, 1) |
1030 | 1030 | ||
1031 | layer_store = gtk.ListStore(gobject.TYPE_STRING) | 1031 | layer_store = gtk.ListStore(gobject.TYPE_STRING) |
1032 | core_iter = None | ||
1033 | for layer in layers: | 1032 | for layer in layers: |
1034 | if layer.endswith("/meta"): | 1033 | layer_store.append([layer]) |
1035 | core_iter = layer_store.prepend([layer]) | ||
1036 | elif layer.endswith("/meta-hob") and core_iter: | ||
1037 | layer_store.insert_after(core_iter, [layer]) | ||
1038 | else: | ||
1039 | layer_store.append([layer]) | ||
1040 | 1034 | ||
1041 | col1 = gtk.TreeViewColumn('Enabled') | 1035 | col1 = gtk.TreeViewColumn('Enabled') |
1042 | layer_tv.append_column(col1) | 1036 | layer_tv.append_column(col1) |
@@ -1110,10 +1104,7 @@ class LayerSelectionDialog (CrumbsDialog): | |||
1110 | layers.append(model.get_value(it, 0)) | 1104 | layers.append(model.get_value(it, 0)) |
1111 | it = model.iter_next(it) | 1105 | it = model.iter_next(it) |
1112 | 1106 | ||
1113 | orig_layers = sorted(self.layers) | 1107 | self.layers_changed = (self.layers != layers) |
1114 | layers.sort() | ||
1115 | |||
1116 | self.layers_changed = (orig_layers != layers) | ||
1117 | self.layers = layers | 1108 | self.layers = layers |
1118 | 1109 | ||
1119 | """ | 1110 | """ |