From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R2E9p-0006Ad-Qs for garchives@archives.gentoo.org; Sat, 10 Sep 2011 03:23:06 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CBF1D21C02E; Sat, 10 Sep 2011 03:22:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 91EE021C02E for ; Sat, 10 Sep 2011 03:22:57 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DAFEE1B4025 for ; Sat, 10 Sep 2011 03:22:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id F010A80042 for ; Sat, 10 Sep 2011 03:22:55 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <08079b0683c0c5e9d02aaa8508cae27206e1a46e.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 08079b0683c0c5e9d02aaa8508cae27206e1a46e Date: Sat, 10 Sep 2011 03:22:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 38397e7017530d186ada1424ce3607e7 commit: 08079b0683c0c5e9d02aaa8508cae27206e1a46e Author: Zac Medico gentoo org> AuthorDate: Sat Sep 10 03:22:29 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Sep 10 03:22:29 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D08079b06 depgraph: use _iter_match_pkgs_any where possible --- 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 d6728c1..928f8dc 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) !=3D 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 !=3D pkg.cp: + continue + slots.add(virt_pkg.slot) ret =3D [] if self._visible(pkg): self._cpv_pkg_map[pkg.cpv] =3D pkg