[bitbake-devel] [PATCH 2/4] hob: "Brought in by" sorting should take into account the (+#) information
Cristiana Voicu
cristiana.voicu at intel.com
Tue May 7 08:07:54 UTC 2013
[YOCTO #4332]
Signed-off-by: Cristiana Voicu <cristiana.voicu at intel.com>
---
bitbake/lib/bb/ui/crumbs/hoblistmodel.py | 46 ++++++++++++++++++++++++++++--
1 file changed, 44 insertions(+), 2 deletions(-)
diff --git a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py
index 42fd6ce..887be79 100644
--- a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py
+++ b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py
@@ -126,7 +126,7 @@ class PackageListModel(gtk.ListStore):
sort.set_sort_func(PackageListModel.COL_INC, self.sort_column, PackageListModel.COL_INC)
sort.set_sort_func(PackageListModel.COL_SIZE, self.sort_column, PackageListModel.COL_SIZE)
- sort.set_sort_func(PackageListModel.COL_BINB, self.sort_column, PackageListModel.COL_BINB)
+ sort.set_sort_func(PackageListModel.COL_BINB, self.sort_binb_column)
sort.set_sort_func(PackageListModel.COL_RCP, self.sort_column, PackageListModel.COL_RCP)
return sort
@@ -148,6 +148,27 @@ class PackageListModel(gtk.ListStore):
name2 = model.get_value(row2, PackageListModel.COL_NAME)
return cmp(name1,name2)
+ def sort_binb_column(self, model, row1, row2):
+ value1 = model.get_value(row1, PackageListModel.COL_BINB)
+ value2 = model.get_value(row2, PackageListModel.COL_BINB)
+ value1_list = value1.split(', ')
+ value2_list = value2.split(', ')
+
+ value1 = value1_list[0]
+ value2 = value2_list[0]
+
+ cmp_res = cmp(value1, value2)
+ if cmp_res==0:
+ cmp_size = cmp(len(value1_list), len(value2_list))
+ if cmp_size==0:
+ name1 = model.get_value(row1, PackageListModel.COL_NAME)
+ name2 = model.get_value(row2, PackageListModel.COL_NAME)
+ return cmp(name1,name2)
+ else:
+ return cmp_size
+ else:
+ return cmp_res
+
def exclude_item_sort_func(self, model, iter1, iter2, user_data=None):
if user_data:
val1 = model.get_value(iter1, PackageListModel.COL_NAME)
@@ -582,7 +603,7 @@ class RecipeListModel(gtk.ListStore):
sort.set_sort_func(RecipeListModel.COL_INC, self.sort_column, RecipeListModel.COL_INC)
sort.set_sort_func(RecipeListModel.COL_GROUP, self.sort_column, RecipeListModel.COL_GROUP)
- sort.set_sort_func(RecipeListModel.COL_BINB, self.sort_column, RecipeListModel.COL_BINB)
+ sort.set_sort_func(RecipeListModel.COL_BINB, self.sort_binb_column)
sort.set_sort_func(RecipeListModel.COL_LIC, self.sort_column, RecipeListModel.COL_LIC)
return sort
@@ -600,6 +621,27 @@ class RecipeListModel(gtk.ListStore):
name2 = model.get_value(row2, RecipeListModel.COL_NAME)
return cmp(name1,name2)
+ def sort_binb_column(self, model, row1, row2):
+ value1 = model.get_value(row1, RecipeListModel.COL_BINB)
+ value2 = model.get_value(row2, RecipeListModel.COL_BINB)
+ value1_list = value1.split(', ')
+ value2_list = value2.split(', ')
+
+ value1 = value1_list[0]
+ value2 = value2_list[0]
+
+ cmp_res = cmp(value1, value2)
+ if cmp_res==0:
+ cmp_size = cmp(len(value1_list), len(value2_list))
+ if cmp_size==0:
+ name1 = model.get_value(row1, RecipeListModel.COL_NAME)
+ name2 = model.get_value(row2, RecipeListModel.COL_NAME)
+ return cmp(name1,name2)
+ else:
+ return cmp_size
+ else:
+ return cmp_res
+
def convert_vpath_to_path(self, view_model, view_path):
filtered_model_path = view_model.convert_path_to_child_path(view_path)
filtered_model = view_model.get_model()
--
1.7.9.5
More information about the bitbake-devel
mailing list