diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-08-29 22:54:51 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-08-29 22:54:51 -0700 |
| commit | 5e28fe97e67ab4f3e2d8410a8704156b6bb08555 (patch) | |
| tree | 4f408ca8b0b8e94b8caf18d30363e06cb21ea34f /pym/_emerge | |
| parent | 7d7387b34fdfb6ac8e736ca4e73f1e3f8fa1a705 (diff) | |
| download | portage-5e28fe97e67ab4f3e2d8410a8704156b6bb08555.tar.gz portage-5e28fe97e67ab4f3e2d8410a8704156b6bb08555.tar.bz2 portage-5e28fe97e67ab4f3e2d8410a8704156b6bb08555.zip | |
Remove FEATURES=parse-eapi-ebuild-head
It's already been enabled by default in stable portage for awhile now,
so it should be safe to enable it unconditionally. The PMS eapi-5
branch also says that it's mandatory to parse the EAPI:
http://git.overlays.gentoo.org/gitweb/?p=proj/pms.git;a=commit;h=91d1e1e39b034bde7e5b981a5616a127135f37fa
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/EbuildMetadataPhase.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pym/_emerge/EbuildMetadataPhase.py b/pym/_emerge/EbuildMetadataPhase.py index 9ab03e24e..669b4ae2e 100644 --- a/pym/_emerge/EbuildMetadataPhase.py +++ b/pym/_emerge/EbuildMetadataPhase.py @@ -142,8 +142,7 @@ class EbuildMetadataPhase(SubProcess): def _set_returncode(self, wait_retval): SubProcess._set_returncode(self, wait_retval) # self._raw_metadata is None when _start returns - # early due to an unsupported EAPI detected with - # FEATURES=parse-eapi-ebuild-head + # early due to an unsupported EAPI if self.returncode == os.EX_OK and \ self._raw_metadata is not None: metadata_lines = _unicode_decode(b''.join(self._raw_metadata), @@ -164,8 +163,7 @@ class EbuildMetadataPhase(SubProcess): if (not metadata["EAPI"] or self.eapi_supported) and \ metadata["EAPI"] != parsed_eapi: self._eapi_invalid(metadata) - if 'parse-eapi-ebuild-head' in self.settings.features: - metadata_valid = False + metadata_valid = False if metadata_valid: # Since we're supposed to be able to efficiently obtain the |