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 1R2Oap-0002yi-FA for garchives@archives.gentoo.org; Sat, 10 Sep 2011 14:31:44 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5415E21C04F; Sat, 10 Sep 2011 14:31:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 22A0921C04F for ; Sat, 10 Sep 2011 14:31:32 +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 996111B4007 for ; Sat, 10 Sep 2011 14:31:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id EA61C80044 for ; Sat, 10 Sep 2011 14:31:30 +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: <569bbe4747eceb70b3225101ec9c538b1db475aa.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: 569bbe4747eceb70b3225101ec9c538b1db475aa Date: Sat, 10 Sep 2011 14:31:30 +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: 00c7bb9c3273139aeb1dca234fbb61ef commit: 569bbe4747eceb70b3225101ec9c538b1db475aa Author: Zac Medico gentoo org> AuthorDate: Sat Sep 10 14:31:10 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Sep 10 14:31:10 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D569bbe47 depgraph: use Atom.with_slot() to match virtuals This ensures that USE deps and repo deps are preserved here. --- pym/_emerge/depgraph.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 928f8dc..3cb85dc 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -6557,7 +6557,7 @@ class _dep_check_composite_db(dbapi): ret.append(pkg.cpv) slots.remove(pkg.metadata["SLOT"]) while slots: - slot_atom =3D Atom("%s:%s" % (atom.cp, slots.pop())) + slot_atom =3D atom.with_slot(slots.pop()) pkg, existing =3D self._depgraph._select_package( self._root, slot_atom) if not pkg: