mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

bb/ui/crumbs/tasklistmodel: fix some typos and add comments to mark()

Browse Source 
Two similarly named variables in the mark() method resulted in the wrong
variable being used in a couple of places. This patch adresses this in
several ways:
1) Renames the variables to be less similar
2) Uses the correct variables
3) Adds some coments to document the methods intent

Partially addresses [YOCTO #1355]

(Bitbake rev: ba9f2fe496eec0a221b563ffc9bb76eca592192f)

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-09 11:09:38 -07:00
committed by Richard Purdie
parent 786033f53c
commit 858c79c3e9
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/ui/crumbs/tasklistmodel.py
+16 -8
View File
@@ -316,9 +316,13 @@ class TaskListModel(gtk.ListStore):
def mark(self, opath): def mark(self, opath):
usersel = {} usersel = {}
removed = [] removed = []
it = self.get_iter_first()
name = self[opath][self.COL_NAME]
it = self.get_iter_first()
# The name of the item we're removing, so that we can use it to find
# other items which either depend on it, or were brought in by it
marked_name = self[opath][self.COL_NAME]
# Remove the passed item
self.remove_item_path(opath) self.remove_item_path(opath)
# Remove all dependent packages, update binb # Remove all dependent packages, update binb
@@ -330,7 +334,7 @@ class TaskListModel(gtk.ListStore):
deps = self[path][self.COL_DEPS] deps = self[path][self.COL_DEPS]
binb = self[path][self.COL_BINB] binb = self[path][self.COL_BINB]
itype = self[path][self.COL_TYPE] itype = self[path][self.COL_TYPE]
iname = self[path][self.COL_NAME] itname = self[path][self.COL_NAME]
# We ignore anything that isn't a package # We ignore anything that isn't a package
if not itype == "package": if not itype == "package":
@@ -341,16 +345,20 @@ class TaskListModel(gtk.ListStore):
# is to save its name and re-mark it for inclusion once dependency # is to save its name and re-mark it for inclusion once dependency
# processing is complete # processing is complete
if binb == "User Selected": if binb == "User Selected":
usersel[iname] = self[path][self.COL_IMG] usersel[itname] = self[path][self.COL_IMG]
# If the iterated item is included and depends on the 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(name) and name not in removed: if inc and deps.count(marked_name) and itname not in removed:
# found a dependency, remove it # found a dependency, remove it
removed.append(name) removed.append(itname)
self.mark(path) self.mark(path)
if inc and binb.count(name): # If the iterated item was brought in by the removed (passed) item
bib = self.find_alt_dependency(name) # try and find an alternative dependee and update the binb column
if inc and binb.count(marked_name):
bib = self.find_alt_dependency(itname)
self[path][self.COL_BINB] = bib self[path][self.COL_BINB] = bib
# Re-add any removed user selected items # Re-add any removed user selected items