summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
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 /bitbake/lib/bb
parent4a438bec7570eba9ae6fcc76b78f1a9da0b62a34 (diff)
downloadpoky-e5c961714c9555de1a3ad3f49c4dd6d57ec079b9.tar.gz
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>
Diffstat (limited to 'bitbake/lib/bb')
-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):
390 if not cur_inc: 390 if not cur_inc:
391 self[item_path][self.COL_INC] = True 391 self[item_path][self.COL_INC] = True
392 self[item_path][self.COL_BINB] = binb 392 self[item_path][self.COL_BINB] = binb
393 # We want to do some magic with things which are brought in by the base 393
394 # image so tag them as so 394 # We want to do some magic with things which are brought in by the
395 # base image so tag them as so
395 if image_contents: 396 if image_contents:
396 self[item_path][self.COL_IMG] = True 397 self[item_path][self.COL_IMG] = True
397 if self[item_path][self.COL_TYPE] == 'image': 398 if self[item_path][self.COL_TYPE] == 'image':
@@ -403,12 +404,17 @@ class TaskListModel(gtk.ListStore):
403 # If the contents model doesn't already contain dep, add it 404 # If the contents model doesn't already contain dep, add it
404 # We only care to show things which will end up in the 405 # We only care to show things which will end up in the
405 # resultant image, so filter cross and native recipes 406 # resultant image, so filter cross and native recipes
406 if not self.contents_includes_name(dep) and not dep.endswith("-native") and not dep.endswith("-cross"): 407 dep_included = self.contents_includes_name(dep)
407 path = self.find_path_for_item(dep) 408 path = self.find_path_for_item(dep)
409 if not dep_included and not dep.endswith("-native") and not dep.endswith("-cross"):
408 if path: 410 if path:
409 self.include_item(path, name, image_contents) 411 self.include_item(path, name, image_contents)
410 else: 412 else:
411 pass 413 pass
414 # Set brought in by for any no longer orphan packages
415 elif dep_included and path:
416 if not self[path][self.COL_BINB]:
417 self[path][self.COL_BINB] = name
412 418
413 """ 419 """
414 Find the model path for the item_name 420 Find the model path for the item_name