diff options
author | Cristiana Voicu <cristiana.voicu@intel.com> | 2014-01-08 17:40:04 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-08 17:41:17 +0000 |
commit | 8c102dba491927745d34b15176f9e4ba6c3c07c6 (patch) | |
tree | 8f3e873c1ed54ff6224baa3b52e3e584188ab7d6 /bitbake/lib | |
parent | c89cfd572027a2897f5970050c2344a2ab43c808 (diff) | |
download | poky-8c102dba491927745d34b15176f9e4ba6c3c07c6.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: a1ced88ae46926e28005b83a74eaf89d70dc2b74)
Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/hoblistmodel.py | 8 |
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 b4d2a621b7..79e909c7f1 100644 --- a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py +++ b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py | |||
@@ -199,7 +199,9 @@ class PackageListModel(gtk.ListStore): | |||
199 | return self.cmp_vals(val1, val2, user_data) | 199 | return self.cmp_vals(val1, val2, user_data) |
200 | 200 | ||
201 | def cmp_vals(self, val1, val2, user_data): | 201 | def cmp_vals(self, val1, val2, user_data): |
202 | if val1.startswith(user_data) and not val2.startswith(user_data): | 202 | if val1 is None or val2 is None: |
203 | return 0 | ||
204 | elif val1.startswith(user_data) and not val2.startswith(user_data): | ||
203 | return -1 | 205 | return -1 |
204 | elif not val1.startswith(user_data) and val2.startswith(user_data): | 206 | elif not val1.startswith(user_data) and val2.startswith(user_data): |
205 | return 1 | 207 | return 1 |
@@ -575,7 +577,9 @@ class RecipeListModel(gtk.ListStore): | |||
575 | return self.cmp_vals(val1, val2, user_data) | 577 | return self.cmp_vals(val1, val2, user_data) |
576 | 578 | ||
577 | def cmp_vals(self, val1, val2, user_data): | 579 | def cmp_vals(self, val1, val2, user_data): |
578 | if val1.startswith(user_data) and not val2.startswith(user_data): | 580 | if val1 is None or val2 is None: |
581 | return 0 | ||
582 | elif val1.startswith(user_data) and not val2.startswith(user_data): | ||
579 | return -1 | 583 | return -1 |
580 | elif not val1.startswith(user_data) and val2.startswith(user_data): | 584 | elif not val1.startswith(user_data) and val2.startswith(user_data): |
581 | return 1 | 585 | return 1 |