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 1PmskV-0007K8-18 for garchives@archives.gentoo.org; Tue, 08 Feb 2011 18:57:16 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 253AFE05F1; Tue, 8 Feb 2011 18:57:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id EC50CE05F1 for ; Tue, 8 Feb 2011 18:57:07 +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 6DF8D1B4096 for ; Tue, 8 Feb 2011 18:57:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D0C0B8006A for ; Tue, 8 Feb 2011 18:57:06 +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: <9e7ca47a113714551103cb8e5e8fe4dd51c7deec.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: 9e7ca47a113714551103cb8e5e8fe4dd51c7deec Date: Tue, 8 Feb 2011 18:57:06 +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: 9fbe49dae10c53beb51ede65dcfeb0be commit: 9e7ca47a113714551103cb8e5e8fe4dd51c7deec Author: Zac Medico gentoo org> AuthorDate: Tue Feb 8 18:54:51 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Feb 8 18:54:51 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D9e7ca47a expand_new_virtuals: fix pkg_use_enabled call AttributeError: 'tuple' object has no attribute 'use' --- pym/portage/dep/dep_check.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py index ca65601..6d2d99d 100644 --- a/pym/portage/dep/dep_check.py +++ b/pym/portage/dep/dep_check.py @@ -36,10 +36,10 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, my= settings, myroot=3D"/", if parent is not None: if virt_parent is not None: graph_parent =3D virt_parent - eapi =3D virt_parent[0].metadata['EAPI'] + parent =3D virt_parent[0] else: graph_parent =3D parent - eapi =3D parent.metadata["EAPI"] + eapi =3D parent.metadata["EAPI"] repoman =3D not mysettings.local_config if kwargs["use_binaries"]: portdb =3D trees[myroot]["bintree"].dbapi @@ -124,7 +124,7 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, my= settings, myroot=3D"/", if x.unevaluated_atom.use: virt_atom +=3D str(x.unevaluated_atom.use) virt_atom =3D Atom(virt_atom) - if graph_parent is None: + if parent is None: if myuse is None: virt_atom =3D virt_atom.evaluate_conditionals( mysettings.get("PORTAGE_USE", "").split()) @@ -132,7 +132,7 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, my= settings, myroot=3D"/", virt_atom =3D virt_atom.evaluate_conditionals(myuse) else: virt_atom =3D virt_atom.evaluate_conditionals( - pkg_use_enabled(graph_parent)) + pkg_use_enabled(parent)) else: virt_atom =3D Atom(virt_atom) # According to GLEP 37, RDEPEND is the only dependency