mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-20 12:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

bb/ui/crumbs/tasklistmodel: more robust checking for substrings

Browse Source 
Relying on the count() method of Str to determine whether the string
contains a substring is error prone purely because the return value doesn't
strictly convert to a Boolean value.
To that end take the more pythonic approach of using the in operator (foo
in bar) to check for the substring.
Further, add a helper method for the common case of testing whether a pn
is -native, -cross or virtual/

(Bitbake rev: d7768cefcddd59a5102d7e9b67e4416bf8603f55)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Joshua Lock
2011-08-17 20:17:42 -07:00
committed by Richard Purdie
parent 108220137b
commit c1b31f8996
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
bitbake/lib/bb/ui/crumbs/tasklistmodel.py
View File

@@ -124,6 +124,14 @@ class TaskListModel(gtk.ListStore):
gobject.TYPE_BOOLEAN, gobject.TYPE_BOOLEAN,
gobject.TYPE_STRING) gobject.TYPE_STRING)
"""
Helper method to determine whether name is a target pn
"""
def non_target_name(self, name):
if ('-native' in name) or ('-cross' in name) or name.startswith('virtual/'):
return True
return False
def contents_changed_cb(self, tree_model, path, it=None): def contents_changed_cb(self, tree_model, path, it=None):
pkg_cnt = self.contents.iter_n_children(None) pkg_cnt = self.contents.iter_n_children(None)
self.emit("contents-changed", pkg_cnt) self.emit("contents-changed", pkg_cnt)
@@ -132,7 +140,7 @@ class TaskListModel(gtk.ListStore):
if not model.get_value(it, self.COL_INC) or model.get_value(it, self.COL_TYPE) == 'image': if not model.get_value(it, self.COL_INC) or model.get_value(it, self.COL_TYPE) == 'image':
return False return False
name = model.get_value(it, self.COL_NAME) name = model.get_value(it, self.COL_NAME)
if name.count('-native') or name.count('-cross'): if self.non_target_name(name):
return False return False
else: else:
return True return True
@@ -196,7 +204,7 @@ class TaskListModel(gtk.ListStore):
return False return False
else: else:
name = model.get_value(it, self.COL_NAME) name = model.get_value(it, self.COL_NAME)
if name.count('-native') or name.count('-cross'): if self.non_target_name(name):
return False return False
return True return True
@@ -226,9 +234,9 @@ class TaskListModel(gtk.ListStore):
lic = event_model["pn"][item]["license"] lic = event_model["pn"][item]["license"]
group = event_model["pn"][item]["section"] group = event_model["pn"][item]["section"]
filename = event_model["pn"][item]["filename"] filename = event_model["pn"][item]["filename"]
if name.count('task-') > 0: if ('task-' in name):
atype = 'task' atype = 'task'
elif name.count('-image-') > 0: elif ('-image-' in name):
atype = 'image' atype = 'image'
depends = event_model["depends"].get(item, []) depends = event_model["depends"].get(item, [])
@@ -352,14 +360,14 @@ class TaskListModel(gtk.ListStore):
# If the iterated item is included and depends on the removed # If the iterated item is included and depends on the removed
# item it should also be removed. # item it should also be removed.
# FIXME: need to ensure partial name matching doesn't happen # FIXME: need to ensure partial name matching doesn't happen
if inc and deps.count(marked_name) and itname not in removed: if inc and marked_name in deps and itname not in removed:
# found a dependency, remove it # found a dependency, remove it
removed.append(itname) removed.append(itname)
self.mark(path) self.mark(path)
# If the iterated item was brought in by the removed (passed) item # If the iterated item was brought in by the removed (passed) item
# try and find an alternative dependee and update the binb column # try and find an alternative dependee and update the binb column
if inc and binb.count(marked_name): if inc and marked_name in binb:
bib = self.find_alt_dependency(itname) bib = self.find_alt_dependency(itname)
self[path][self.COL_BINB] = bib self[path][self.COL_BINB] = bib
@@ -411,7 +419,7 @@ class TaskListModel(gtk.ListStore):
deps = self.contents[path][self.COL_DEPS] deps = self.contents[path][self.COL_DEPS]
itname = self.contents[path][self.COL_NAME] itname = self.contents[path][self.COL_NAME]
inc = self.contents[path][self.COL_INC] inc = self.contents[path][self.COL_INC]
if itname != name and inc and deps.count(name) > 0: if itname != name and inc and name in deps:
# if this item depends on the item, return this items name # if this item depends on the item, return this items name
return itname return itname
it = self.contents.iter_next(it) it = self.contents.iter_next(it)
@@ -471,7 +479,7 @@ class TaskListModel(gtk.ListStore):
def find_path_for_item(self, item_name): def find_path_for_item(self, item_name):
# We don't include virtual/* or *-native items in the model so save a # We don't include virtual/* or *-native items in the model so save a
# heavy iteration loop by exiting early for these items # heavy iteration loop by exiting early for these items
if item_name.startswith("virtual/") or item_name.count('-native') or item_name.count('-cross'): if self.non_target_name(item_name):
return None return None
it = self.get_iter_first() it = self.get_iter_first()
@@ -561,7 +569,7 @@ class TaskListModel(gtk.ListStore):
if not itype == 'package': if not itype == 'package':
continue continue
if deps.count(pn) != 0: if pn not in deps:
revdeps.append(name) revdeps.append(name)
if pn in revdeps: if pn in revdeps: