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 1PmP8D-000488-A9 for garchives@archives.gentoo.org; Mon, 07 Feb 2011 11:19:45 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B39E5E08A6; Mon, 7 Feb 2011 11:19:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7ABE5E08A6 for ; Mon, 7 Feb 2011 11:19:37 +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 C2DAA1B40B5 for ; Mon, 7 Feb 2011 11:19:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 372308006A for ; Mon, 7 Feb 2011 11:19:36 +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: 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: a60acb9f203f56af8225dc7dda7c453a12fd6372 Date: Mon, 7 Feb 2011 11:19:36 +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: b8460a4f186752d1ef84ca9c5c988dff commit: a60acb9f203f56af8225dc7dda7c453a12fd6372 Author: Zac Medico gentoo org> AuthorDate: Mon Feb 7 11:11:08 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Feb 7 11:11:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Da60acb9f expand_new_virtuals: save atom unevaluated use This leads to a better unsatisfied USE message than the one reported in bug 353933, comment #3. TODO: Fix it so that these generated atoms don't break depgraph._get_dep_chain(), due to not being identical to the original atoms and therefore breaking extract_affecting_use(). --- pym/portage/dep/dep_check.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py index cd740cd..3381af9 100644 --- a/pym/portage/dep/dep_check.py +++ b/pym/portage/dep/dep_check.py @@ -121,8 +121,8 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, my= settings, myroot=3D"/", a =3D [] for pkg in pkgs: virt_atom =3D '=3D' + pkg.cpv - if x.use: - virt_atom +=3D str(x.use) + if x.unevaluated_atom.use: + virt_atom +=3D str(x.unevaluated_atom.use) virt_atom =3D Atom(virt_atom) # According to GLEP 37, RDEPEND is the only dependency # type that is valid for new-style virtuals. Repoman