diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-09-09 20:22:29 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-09-09 20:22:29 -0700 |
| commit | 08079b0683c0c5e9d02aaa8508cae27206e1a46e (patch) | |
| tree | d1a3d40c26cb077b65f54edee8b8ff976a014339 /pym | |
| parent | db32c3e3ca1e3cc724acacc79a5be2343efc13d1 (diff) | |
| download | portage-08079b0683c0c5e9d02aaa8508cae27206e1a46e.tar.gz portage-08079b0683c0c5e9d02aaa8508cae27206e1a46e.tar.bz2 portage-08079b0683c0c5e9d02aaa8508cae27206e1a46e.zip | |
depgraph: use _iter_match_pkgs_any where possible
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/depgraph.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index d6728c106..928f8dc88 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -6546,12 +6546,11 @@ class _dep_check_composite_db(dbapi): # example, if virtual/jdk-1.4 is satisfied via kaffe then # there's no need to pull in a newer slot to satisfy a # virtual/jdk dependency. - for db, pkg_type, built, installed, db_keys in \ - self._depgraph._dynamic_config._filtered_trees[self._root]["dbs"]: - for cpv in db.match(atom): - if portage.cpv_getkey(cpv) != pkg.cp: - continue - slots.add(db.aux_get(cpv, ["SLOT"])[0]) + for virt_pkg in self._depgraph._iter_match_pkgs_any( + self._depgraph._frozen_config.roots[self._root], atom): + if virt_pkg.cp != pkg.cp: + continue + slots.add(virt_pkg.slot) ret = [] if self._visible(pkg): self._cpv_pkg_map[pkg.cpv] = pkg |