diff options
| author |   Joshua Lock <josh@linux.intel.com> | 2011-08-17 20:25:12 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-23 09:59:50 -0700 |
| commit | 70aebebc3867d52e460355667e711c7c6dcd50ce (patch) | |
| tree | a3763345ec26e54da71e6720f94cbab74021da80 | |
| parent | d7768cefcddd59a5102d7e9b67e4416bf8603f55 (diff) | |
| download | bitbake-70aebebc3867d52e460355667e711c7c6dcd50ce.tar.gz | |
bb/ui/crumbs/tasklistmodel: remove useless items from dependency list
Ensure the dependency list is uniquified, doesn't include self references
and further doesn't include -dev references.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
| -rw-r--r-- | lib/bb/ui/crumbs/tasklistmodel.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/bb/ui/crumbs/tasklistmodel.py b/lib/bb/ui/crumbs/tasklistmodel.py index fa1660967..b0f5d7a7b 100644 --- a/lib/bb/ui/crumbs/tasklistmodel.py +++ b/lib/bb/ui/crumbs/tasklistmodel.py @@ -239,10 +239,11 @@ class TaskListModel(gtk.ListStore): elif ('-image-' in name): atype = 'image' + # Create a combined list of build and runtime dependencies and + # then remove any duplicate entries and any entries for -dev + # packages depends = event_model["depends"].get(item, []) rdepends = event_model["rdepends-pn"].get(item, []) - if ("%s-dev" % item) in rdepends: - rdepends.remove("%s-dev" % item) packages = {} for pkg in event_model["packages"]: if event_model["packages"][pkg]["pn"] == name: @@ -250,6 +251,13 @@ class TaskListModel(gtk.ListStore): deps.extend(depends) deps.extend(event_model["rdepends-pkg"].get(pkg, [])) deps.extend(rdepends) + deps = self.squish(deps) + # rdepends-pn includes pn-dev + if ("%s-dev" % item) in deps: + deps.remove("%s-dev" % item) + # rdepends-on includes pn + if pkg in deps: + deps.remove(pkg) packages[pkg] = deps for p in packages: |