summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2011-08-17 20:25:12 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-23 10:00:32 -0700
commitd2f1ede68afa3a718bbf71b2739107667ecde37b (patch)
treebf94b4c6a9f0991a1f64fc6e08fafad7ccdd00f6
parentc1b31f899675bafd4b69e567299f968a0a52cc2e (diff)
downloadpoky-d2f1ede68afa3a718bbf71b2739107667ecde37b.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. (Bitbake rev: 70aebebc3867d52e460355667e711c7c6dcd50ce) 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.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/tasklistmodel.py b/bitbake/lib/bb/ui/crumbs/tasklistmodel.py
index fa16609678..b0f5d7a7b6 100644
--- a/bitbake/lib/bb/ui/crumbs/tasklistmodel.py
+++ b/bitbake/lib/bb/ui/crumbs/tasklistmodel.py
@@ -239,10 +239,11 @@ class TaskListModel(gtk.ListStore):
239 elif ('-image-' in name): 239 elif ('-image-' in name):
240 atype = 'image' 240 atype = 'image'
241 241
242 # Create a combined list of build and runtime dependencies and
243 # then remove any duplicate entries and any entries for -dev
244 # packages
242 depends = event_model["depends"].get(item, []) 245 depends = event_model["depends"].get(item, [])
243 rdepends = event_model["rdepends-pn"].get(item, []) 246 rdepends = event_model["rdepends-pn"].get(item, [])
244 if ("%s-dev" % item) in rdepends:
245 rdepends.remove("%s-dev" % item)
246 packages = {} 247 packages = {}
247 for pkg in event_model["packages"]: 248 for pkg in event_model["packages"]:
248 if event_model["packages"][pkg]["pn"] == name: 249 if event_model["packages"][pkg]["pn"] == name:
@@ -250,6 +251,13 @@ class TaskListModel(gtk.ListStore):
250 deps.extend(depends) 251 deps.extend(depends)
251 deps.extend(event_model["rdepends-pkg"].get(pkg, [])) 252 deps.extend(event_model["rdepends-pkg"].get(pkg, []))
252 deps.extend(rdepends) 253 deps.extend(rdepends)
254 deps = self.squish(deps)
255 # rdepends-pn includes pn-dev
256 if ("%s-dev" % item) in deps:
257 deps.remove("%s-dev" % item)
258 # rdepends-on includes pn
259 if pkg in deps:
260 deps.remove(pkg)
253 packages[pkg] = deps 261 packages[pkg] = deps
254 262
255 for p in packages: 263 for p in packages: