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 1PmPWp-0007Tq-HZ for garchives@archives.gentoo.org; Mon, 07 Feb 2011 11:45:11 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3CF20E081A; Mon, 7 Feb 2011 11:45:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 10786E081A for ; Mon, 7 Feb 2011 11:45:03 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5C0F81B4119 for ; Mon, 7 Feb 2011 11:45:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D91578006A for ; Mon, 7 Feb 2011 11:45:02 +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: <7e735aaa79ed26901c66b9444e4098b320abc2d5.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dep/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dep/dep_check.py X-VCS-Directories: pym/portage/dep/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 7e735aaa79ed26901c66b9444e4098b320abc2d5 Date: Mon, 7 Feb 2011 11:45:02 +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: 071793eb2612735410e2b31e6c9d8314 commit: 7e735aaa79ed26901c66b9444e4098b320abc2d5 Author: Zac Medico gentoo org> AuthorDate: Mon Feb 7 11:43:06 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Feb 7 11:43:06 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D7e735aaa expand_new_virtuals: fix logic from prev commit We need to evaluate conditionals for dependency matching purposes, though the unevaluated atom will still be available later for other purposes. --- pym/portage/dep/dep_check.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py index 3381af9..da9b4e5 100644 --- a/pym/portage/dep/dep_check.py +++ b/pym/portage/dep/dep_check.py @@ -123,7 +123,11 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, m= ysettings, myroot=3D"/", virt_atom =3D '=3D' + pkg.cpv if x.unevaluated_atom.use: virt_atom +=3D str(x.unevaluated_atom.use) - virt_atom =3D Atom(virt_atom) + virt_atom =3D Atom(virt_atom) + virt_atom =3D virt_atom.evaluate_conditionals( + pkg_use_enabled(graph_parent)) + else: + virt_atom =3D Atom(virt_atom) # According to GLEP 37, RDEPEND is the only dependency # type that is valid for new-style virtuals. Repoman # should enforce this.