summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2011-07-12 14:48:58 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-13 12:29:17 +0100
commite5c961714c9555de1a3ad3f49c4dd6d57ec079b9 (patch)
treeaea792c3c73d6f2291e029a77aa851b2a95139cb
parent4a438bec7570eba9ae6fcc76b78f1a9da0b62a34 (diff)
downloadpoky-e5c961714c9555de1a3ad3f49c4dd6d57ec079b9.tar.gz
poky-e5c961714c9555de1a3ad3f49c4dd6d57ec079b9.tar.bz2
poky-e5c961714c9555de1a3ad3f49c4dd6d57ec079b9.zip
ui/crumbs/tasklistmodel: update brought in by column when possible
When a package is orphaned we were not correctly updating the brought-in-by column if a later package additon would have brought that package in as a dependency. This patch ensures that orphan packages are correctly re-parented when appropriate. Partially addresses [YOCTO #1218] (Bitbake rev: 570405f2f5a3976b308ef825ef477fb5cb6ee804) Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/ui/crumbs/tasklistmodel.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/tasklistmodel.py b/bitbake/lib/bb/ui/crumbs/tasklistmodel.py
index 5e979b7e2f..3e74e7fd32 100644
--- a/bitbake/lib/bb/ui/crumbs/tasklistmodel.py
+++ b/bitbake/lib/bb/ui/crumbs/tasklistmodel.py
@@ -390,8 +390,9 @@ class TaskListModel(gtk.ListStore):
if not cur_inc:
self[item_path][self.COL_INC] = True
self[item_path][self.COL_BINB] = binb
- # We want to do some magic with things which are brought in by the base
- # image so tag them as so
+
+ # We want to do some magic with things which are brought in by the
+ # base image so tag them as so
if image_contents:
self[item_path][self.COL_IMG] = True
if self[item_path][self.COL_TYPE] == 'image':
@@ -403,12 +404,17 @@ class TaskListModel(gtk.ListStore):
# If the contents model doesn't already contain dep, add it
# We only care to show things which will end up in the
# resultant image, so filter cross and native recipes
- if not self.contents_includes_name(dep) and not dep.endswith("-native") and not dep.endswith("-cross"):
- path = self.find_path_for_item(dep)
+ dep_included = self.contents_includes_name(dep)
+ path = self.find_path_for_item(dep)
+ if not dep_included and not dep.endswith("-native") and not dep.endswith("-cross"):
if path:
self.include_item(path, name, image_contents)
else:
pass
+ # Set brought in by for any no longer orphan packages
+ elif dep_included and path:
+ if not self[path][self.COL_BINB]:
+ self[path][self.COL_BINB] = name
"""
Find the model path for the item_name