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 1Pmbfw-00085x-Ry for garchives@archives.gentoo.org; Tue, 08 Feb 2011 00:43:25 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D3C90E09FA; Tue, 8 Feb 2011 00:43:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A6634E09FA for ; Tue, 8 Feb 2011 00:43:16 +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 33E161B4046 for ; Tue, 8 Feb 2011 00:43:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9D7EC8006A for ; Tue, 8 Feb 2011 00:43:15 +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: <15389929b684b41801ffc880c4a4e6714e4245b6.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: 15389929b684b41801ffc880c4a4e6714e4245b6 Date: Tue, 8 Feb 2011 00:43:15 +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: 690c33a587357edae13a43740e58fe9f commit: 15389929b684b41801ffc880c4a4e6714e4245b6 Author: Zac Medico gentoo org> AuthorDate: Tue Feb 8 00:42:37 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Feb 8 00:42:37 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D15389929 expand_new_virtuals: handle None for myuse --- 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 9373ecb..ca65601 100644 --- a/pym/portage/dep/dep_check.py +++ b/pym/portage/dep/dep_check.py @@ -125,7 +125,11 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, m= ysettings, myroot=3D"/", virt_atom +=3D str(x.unevaluated_atom.use) virt_atom =3D Atom(virt_atom) if graph_parent is None: - virt_atom =3D virt_atom.evaluate_conditionals(myuse) + if myuse is None: + virt_atom =3D virt_atom.evaluate_conditionals( + mysettings.get("PORTAGE_USE", "").split()) + else: + virt_atom =3D virt_atom.evaluate_conditionals(myuse) else: virt_atom =3D virt_atom.evaluate_conditionals( pkg_use_enabled(graph_parent))