summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristiana Voicu <cristiana.voicu@intel.com>2014-01-08 17:35:19 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-08 17:37:02 +0000
commitd2bfdb12d64e8dfa6c4518c159065d39456667bb (patch)
treeec039cba4cb63fb736b6013e598794f4232c76e3
parenta779ae4d4ef47fc36b98ec5753289af7755fcd03 (diff)
downloadbitbake-d2bfdb12d64e8dfa6c4518c159065d39456667bb.tar.gz
hob/hoblistmodel: check if vals of packages/recipes names are not None
[YOCTO #5053] (Corresponds to BitBake master rev: ba9fe77e37be31e8246431578902e871dd94515e) Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/ui/crumbs/hoblistmodel.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/bb/ui/crumbs/hoblistmodel.py b/lib/bb/ui/crumbs/hoblistmodel.py
index 547c1cade..f6b3f09b9 100644
--- a/lib/bb/ui/crumbs/hoblistmodel.py
+++ b/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