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 1SSDYX-0002jA-HE for garchives@archives.gentoo.org; Wed, 09 May 2012 20:32:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C17CDE0938; Wed, 9 May 2012 20:32:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 925EAE0938 for ; Wed, 9 May 2012 20:32:07 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F321E1B400C for ; Wed, 9 May 2012 20:32:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BC2E7E542D for ; Wed, 9 May 2012 20:32:05 +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: <1336595512.caceafbca156fdd1e5cc64d1e24a6bdc39022945.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/EbuildMetadataPhase.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: caceafbca156fdd1e5cc64d1e24a6bdc39022945 X-VCS-Branch: master Date: Wed, 9 May 2012 20:32:05 +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: 2396319c-f312-46e9-9746-7b2a31ba78bd X-Archives-Hash: 455a84a3d17079aa564997ae6befee69 commit: caceafbca156fdd1e5cc64d1e24a6bdc39022945 Author: Zac Medico gentoo org> AuthorDate: Wed May 9 20:31:52 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed May 9 20:31:52 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dcaceafbc EbuildMetadataPhase: handle empty EAPI from bash --- pym/_emerge/EbuildMetadataPhase.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/EbuildMetadataPhase.py b/pym/_emerge/EbuildMetad= ataPhase.py index b7af69d..7f9bd3b 100644 --- a/pym/_emerge/EbuildMetadataPhase.py +++ b/pym/_emerge/EbuildMetadataPhase.py @@ -158,7 +158,8 @@ class EbuildMetadataPhase(SubProcess): parsed_eapi =3D self._eapi if parsed_eapi is None: parsed_eapi =3D "0" - if portage.eapi_is_supported(metadata["EAPI"]) and \ + if (not metadata["EAPI"] or + portage.eapi_is_supported(metadata["EAPI"])) and \ metadata["EAPI"] !=3D parsed_eapi: self._eapi_invalid(metadata) if 'parse-eapi-ebuild-head' in self.settings.features: