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 1Pmbr0-0001GE-BX for garchives@archives.gentoo.org; Tue, 08 Feb 2011 00:54:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 747C0E0B46; Tue, 8 Feb 2011 00:54:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 45C28E0B46 for ; Tue, 8 Feb 2011 00:54:22 +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 CD1DA1B4091 for ; Tue, 8 Feb 2011 00:54:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3D54280072 for ; Tue, 8 Feb 2011 00:54:21 +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: <7f2874ee2366a1a94534e9b3d97bd2f43573d4d4.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:2.1.9 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: 7f2874ee2366a1a94534e9b3d97bd2f43573d4d4 Date: Tue, 8 Feb 2011 00:54:21 +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: 252723971c8822d0feca7cf26ce1ca90 commit: 7f2874ee2366a1a94534e9b3d97bd2f43573d4d4 Author: Zac Medico gentoo org> AuthorDate: Mon Feb 7 22:19:33 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Feb 8 00:53:30 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D7f2874ee expand_new_virtuals: fix last commit USE handling --- pym/portage/dep/dep_check.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py index 60896c0..9373ecb 100644 --- a/pym/portage/dep/dep_check.py +++ b/pym/portage/dep/dep_check.py @@ -124,8 +124,11 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, m= ysettings, myroot=3D"/", if x.unevaluated_atom.use: virt_atom +=3D str(x.unevaluated_atom.use) virt_atom =3D Atom(virt_atom) - virt_atom =3D virt_atom.evaluate_conditionals( - pkg_use_enabled(graph_parent)) + if graph_parent is None: + virt_atom =3D virt_atom.evaluate_conditionals(myuse) + else: + 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