diff options
author | Zac Medico <zmedico@gentoo.org> | 2012-05-08 23:38:47 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2012-05-09 00:09:22 -0700 |
commit | 20817801dd4ef0117bcc7b33c90650da1e920385 (patch) | |
tree | c2e30f858b87e9d1504774a8e84791aff149453c /pym/_emerge/actions.py | |
parent | 476f99337da69662660bfe2a0406b9ac5b4678c4 (diff) | |
download | portage-20817801dd4ef0117bcc7b33c90650da1e920385.tar.gz portage-20817801dd4ef0117bcc7b33c90650da1e920385.tar.bz2 portage-20817801dd4ef0117bcc7b33c90650da1e920385.zip |
Parse EAPI with pattern from PMS section 7.3.1.
This implements the specification that was approved in Gentoo's council
meeting on May 8, 2012 (see bug #402167). The parse-eapi-ebuild-head
FEATURES setting is now enabled by default, and causes non-conformant
ebuilds to be treated as invalid. This behavior will soon become
enabled unconditionally.
Diffstat (limited to 'pym/_emerge/actions.py')
-rw-r--r-- | pym/_emerge/actions.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 9c8712050..62f3ff79d 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -28,7 +28,7 @@ portage.proxy.lazyimport.lazyimport(globals(), from portage.localization import _ from portage import os from portage import shutil -from portage import _unicode_decode +from portage import eapi_is_supported, _unicode_decode from portage.cache.cache_errors import CacheError from portage.const import GLOBAL_CONFIG_PATH from portage.const import _ENABLE_DYN_LINK_MAP, _ENABLE_SET_CONFIG @@ -1716,9 +1716,6 @@ def action_metadata(settings, portdb, myopts, porttrees=None): if onProgress is not None: onProgress(maxval, curval) - from portage import eapi_is_supported, \ - _validate_cache_for_unsupported_eapis - # TODO: Display error messages, but do not interfere with the progress bar. # Here's how: # 1) erase the progress bar @@ -1758,8 +1755,7 @@ def action_metadata(settings, portdb, myopts, porttrees=None): eapi = eapi.lstrip('-') eapi_supported = eapi_is_supported(eapi) if not eapi_supported: - if not _validate_cache_for_unsupported_eapis: - continue + continue dest = None try: |