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 1RFDA1-0004MJ-IX for garchives@archives.gentoo.org; Sat, 15 Oct 2011 22:56:57 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59F5921C051; Sat, 15 Oct 2011 22:56:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2787821C051 for ; Sat, 15 Oct 2011 22:56:50 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B6D751B400C for ; Sat, 15 Oct 2011 22:56:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B4D1D80042 for ; Sat, 15 Oct 2011 22:56:48 +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: <0a60f0a859994ca2ed51aa0b20454743f970b956.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: 0a60f0a859994ca2ed51aa0b20454743f970b956 Date: Sat, 15 Oct 2011 22:56:48 +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: 5267331b810acff67c5358a16490b987 commit: 0a60f0a859994ca2ed51aa0b20454743f970b956 Author: Zac Medico gentoo org> AuthorDate: Sat Oct 15 22:55:31 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Oct 15 22:55:31 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D0a60f0a8 EbuildMetadataPhase: fix parse-eapi-ebuild-head This fixes bugs that can only be triggered by egencache since other callers handle parse-eapi-ebuild-head earlier. --- pym/_emerge/EbuildMetadataPhase.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/EbuildMetadataPhase.py b/pym/_emerge/EbuildMetad= ataPhase.py index a6630ad..6ef7c00 100644 --- a/pym/_emerge/EbuildMetadataPhase.py +++ b/pym/_emerge/EbuildMetadataPhase.py @@ -44,8 +44,9 @@ class EbuildMetadataPhase(SubProcess): =20 if eapi is not None: if not portage.eapi_is_supported(eapi): + self.metadata =3D {'EAPI' : eapi} self.metadata_callback(self.cpv, - self.repo_path, {'EAPI' : eapi}, self.ebuild_hash) + self.repo_path, self.metadata, self.ebuild_hash) self._set_returncode((self.pid, os.EX_OK << 8)) self.wait() return @@ -117,7 +118,11 @@ class EbuildMetadataPhase(SubProcess): =20 def _set_returncode(self, wait_retval): SubProcess._set_returncode(self, wait_retval) - if self.returncode =3D=3D os.EX_OK: + # self._raw_metadata is None when _start returns + # early due to an unsupported EAPI detected with + # FEATURES=3Dparse-eapi-ebuild-head + if self.returncode =3D=3D os.EX_OK and \ + self._raw_metadata is not None: metadata_lines =3D _unicode_decode(b''.join(self._raw_metadata), encoding=3D_encodings['repo.content'], errors=3D'replace').splitlines()