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 1QF5rG-0004V9-CL for garchives@archives.gentoo.org; Wed, 27 Apr 2011 14:36:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2953D1C032; Wed, 27 Apr 2011 14:36:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DAB8D1C032 for ; Wed, 27 Apr 2011 14:36:41 +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 60A0F1B4003 for ; Wed, 27 Apr 2011 14:36:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8C8DF80505 for ; Wed, 27 Apr 2011 14:36:40 +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/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/actions.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: ffe4f3feb6cd9b2bc3b38086894fec8133db1834 Date: Wed, 27 Apr 2011 14:36:40 +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: 5d0b7fbdbe5e304454c8e044d86a2f7f commit: ffe4f3feb6cd9b2bc3b38086894fec8133db1834 Author: Zac Medico gentoo org> AuthorDate: Wed Apr 27 14:35:57 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Apr 27 14:35:57 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dffe4f3fe expand_new_virt: validate EAPI, IUSE and USE --- pym/_emerge/actions.py | 29 +++++++++++++++++++++++++---- 1 files changed, 25 insertions(+), 4 deletions(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index c05d7e2..99619fa 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -31,7 +31,7 @@ from portage.cache.cache_errors import CacheError from portage.const import GLOBAL_CONFIG_PATH, NEWS_LIB_PATH from portage.const import _ENABLE_DYN_LINK_MAP, _ENABLE_SET_CONFIG from portage.dbapi.dep_expand import dep_expand -from portage.dep import Atom, extended_cp_match +from portage.dep import Atom, extended_cp_match, _get_useflag_re from portage.exception import InvalidAtom from portage.output import blue, bold, colorize, create_color_func, dark= green, \ red, yellow @@ -1311,10 +1311,31 @@ def expand_new_virt(vardb, atom): continue =20 traversed.add(virt_cpv) - rdepend, use =3D vardb.aux_get(virt_cpv, ["RDEPEND", "USE"]) - use =3D frozenset(use.split()) + eapi, iuse, rdepend, use =3D vardb.aux_get(virt_cpv, + ["EAPI", "IUSE", "RDEPEND", "USE"]) + if not portage.eapi_is_supported(eapi): + yield atom + continue + + # Validate IUSE and IUSE, for early detection of vardb corruption. + useflag_re =3D _get_useflag_re(eapi) + valid_iuse =3D [] + for x in iuse.split(): + if x[:1] in ("+", "-"): + x =3D x[1:] + if useflag_re.match(x) is not None: + valid_iuse.append(x) + valid_iuse =3D frozenset(valid_iuse) + + iuse_implicit_match =3D vardb.settings._iuse_implicit_match + valid_use =3D [] + for x in use.split(): + if x in valid_iuse or iuse_implicit_match(x): + valid_use.append(x) + valid_use =3D frozenset(valid_use) + success, atoms =3D portage.dep_check(rdepend, - None, vardb.settings, myuse=3Duse, + None, vardb.settings, myuse=3Dvalid_use, myroot=3Dvardb.root, trees=3D{vardb.root:{"porttree":vardb.vartree, "vartree":vardb.vartree}}) =20