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/portage | |
| 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/portage')
| -rw-r--r-- | pym/portage/const.py | 1 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/_eapi_invalid.py | 13 | ||||
| -rw-r--r-- | pym/portage/tests/emerge/test_simple.py | 2 |
3 files changed, 1 insertions, 15 deletions
diff --git a/pym/portage/const.py b/pym/portage/const.py index 6dffc5d06..3b8e350a2 100644 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@ -99,7 +99,6 @@ SUPPORTED_FEATURES = frozenset([ "metadata-transfer", "mirror", "multilib-strict", "news", "noauto", "noclean", "nodoc", "noinfo", "noman", "nostrip", "notitles", "parallel-fetch", "parallel-install", - "parse-eapi-ebuild-head", "prelink-checksums", "protect-owned", "python-trace", "sandbox", "selinux", "sesandbox", "sfperms", diff --git a/pym/portage/package/ebuild/_eapi_invalid.py b/pym/portage/package/ebuild/_eapi_invalid.py index d23677d23..bcf1f7fcd 100644 --- a/pym/portage/package/ebuild/_eapi_invalid.py +++ b/pym/portage/package/ebuild/_eapi_invalid.py @@ -28,19 +28,6 @@ def eapi_invalid(self, cpv, repo_name, settings, "assignment on line: %s") % (eapi_var, eapi_lineno)) - if 'parse-eapi-ebuild-head' in settings.features: - msg.extend(textwrap.wrap(("NOTE: This error will soon" - " become unconditionally fatal in a future version of Portage," - " but at this time, it can by made non-fatal by setting" - " FEATURES=-parse-eapi-ebuild-head in" - " make.conf."), 70)) - else: - msg.extend(textwrap.wrap(("NOTE: This error will soon" - " become unconditionally fatal in a future version of Portage." - " At the earliest opportunity, please enable" - " FEATURES=parse-eapi-ebuild-head in make.conf in order to" - " make this error fatal."), 70)) - if portage.data.secpass >= 2: # TODO: improve elog permission error handling (bug #416231) for line in msg: diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py index f87170a71..77a0554c0 100644 --- a/pym/portage/tests/emerge/test_simple.py +++ b/pym/portage/tests/emerge/test_simple.py @@ -210,7 +210,7 @@ pkg_preinst() { ({"FEATURES" : "metadata-transfer"},) + \ emerge_cmd + ("--regen",), rm_cmd + ("-rf", cachedir), - ({"FEATURES" : "metadata-transfer parse-eapi-ebuild-head"},) + \ + ({"FEATURES" : "metadata-transfer"},) + \ emerge_cmd + ("--regen",), rm_cmd + ("-rf", cachedir), egencache_cmd + ("--update",) + tuple(egencache_extra_args), |