summaryrefslogtreecommitdiffstats
path: root/bitbake
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:41:21 +0000
commit9cf2e005d1754a8f92d3d5896d17a2f1fa501760 (patch)
tree6aa2ac7fb210f880eae03212422b835362ebe2ee /bitbake
parentda8a5ec9208a1716d3a1cdd87b1547cb00ff82e7 (diff)
downloadpoky-9cf2e005d1754a8f92d3d5896d17a2f1fa501760.tar.gz
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 <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/ui/crumbs/hoblistmodel.py8
1 files changed, 6 insertions, 2 deletions
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):
181 def sort_func(self, model, iter1, iter2, user_data): 181 def sort_func(self, model, iter1, iter2, user_data):
182 val1 = model.get_value(iter1, PackageListModel.COL_NAME) 182 val1 = model.get_value(iter1, PackageListModel.COL_NAME)
183 val2 = model.get_value(iter2, PackageListModel.COL_NAME) 183 val2 = model.get_value(iter2, PackageListModel.COL_NAME)
184 if val1.startswith(user_data) and not val2.startswith(user_data): 184 if val1 is None or val2 is None:
185 return 0
186 elif val1.startswith(user_data) and not val2.startswith(user_data):
185 return -1 187 return -1
186 elif not val1.startswith(user_data) and val2.startswith(user_data): 188 elif not val1.startswith(user_data) and val2.startswith(user_data):
187 return 1 189 return 1
@@ -562,7 +564,9 @@ class RecipeListModel(gtk.ListStore):
562 def sort_func(self, model, iter1, iter2, user_data): 564 def sort_func(self, model, iter1, iter2, user_data):
563 val1 = model.get_value(iter1, RecipeListModel.COL_NAME) 565 val1 = model.get_value(iter1, RecipeListModel.COL_NAME)
564 val2 = model.get_value(iter2, RecipeListModel.COL_NAME) 566 val2 = model.get_value(iter2, RecipeListModel.COL_NAME)
565 if val1.startswith(user_data) and not val2.startswith(user_data): 567 if val1 is None or val2 is None:
568 return 0
569 elif val1.startswith(user_data) and not val2.startswith(user_data):
566 return -1 570 return -1
567 elif not val1.startswith(user_data) and val2.startswith(user_data): 571 elif not val1.startswith(user_data) and val2.startswith(user_data):
568 return 1 572 return 1