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.

diff --git a/pym/_emerge/EbuildMetadataPhase.py b/pym/_emerge/EbuildMetadataPhase.py
index a6630ad1053ee1d0e7607262880cc6c7c5d5ba9d..6ef7c0010dfca8c97d5563282408d17a03570771 100644 (file)
--- a/pym/_emerge/EbuildMetadataPhase.py
+++ b/pym/_emerge/EbuildMetadataPhase.py
@@ -44,8 +44,9 @@ class EbuildMetadataPhase(SubProcess):
 
                if eapi is not None:
                        if not portage.eapi_is_supported(eapi):
+                               self.metadata = {'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):
 
        def _set_returncode(self, wait_retval):
                SubProcess._set_returncode(self, wait_retval)
-               if self.returncode == os.EX_OK:
+               # self._raw_metadata is None when _start returns
+               # early due to an unsupported EAPI detected with
+               # FEATURES=parse-eapi-ebuild-head
+               if self.returncode == os.EX_OK and \
+                       self._raw_metadata is not None:
                        metadata_lines = _unicode_decode(b''.join(self._raw_metadata),
                                encoding=_encodings['repo.content'],
                                errors='replace').splitlines()