From 9cf2e005d1754a8f92d3d5896d17a2f1fa501760 Mon Sep 17 00:00:00 2001 From: Cristiana Voicu Date: Wed, 8 Jan 2014 17:35:19 +0000 Subject: bitbake: hob/hoblistmodel: check if vals of packages/recipes names are not None [YOCTO #5053] (Corresponds to BitBake master rev: ba9fe77e37be31e8246431578902e871dd94515e) (Bitbake rev: d2bfdb12d64e8dfa6c4518c159065d39456667bb) Signed-off-by: Cristiana Voicu Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/hoblistmodel.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py index 547c1cade9..f6b3f09b95 100644 --- a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py +++ b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py @@ -181,7 +181,9 @@ class PackageListModel(gtk.ListStore): def sort_func(self, model, iter1, iter2, user_data): val1 = model.get_value(iter1, PackageListModel.COL_NAME) val2 = model.get_value(iter2, PackageListModel.COL_NAME) - if val1.startswith(user_data) and not val2.startswith(user_data): + if val1 is None or val2 is None: + return 0 + elif val1.startswith(user_data) and not val2.startswith(user_data): return -1 elif not val1.startswith(user_data) and val2.startswith(user_data): return 1 @@ -562,7 +564,9 @@ class RecipeListModel(gtk.ListStore): def sort_func(self, model, iter1, iter2, user_data): val1 = model.get_value(iter1, RecipeListModel.COL_NAME) val2 = model.get_value(iter2, RecipeListModel.COL_NAME) - if val1.startswith(user_data) and not val2.startswith(user_data): + if val1 is None or val2 is None: + return 0 + elif val1.startswith(user_data) and not val2.startswith(user_data): return -1 elif not val1.startswith(user_data) and val2.startswith(user_data): return 1 -- cgit v1.2.3-54-g00ecf