summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-05-09 01:12:58 -0700
committerZac Medico <zmedico@gentoo.org>2012-05-09 01:12:58 -0700
commit4fef960c0b3681ea5389e3a639ab1e30115c2021 (patch)
tree294e5131436ccc11ba2efbc5d3e5144bcbdd10b6
parent20817801dd4ef0117bcc7b33c90650da1e920385 (diff)
downloadportage-4fef960c0b3681ea5389e3a639ab1e30115c2021.tar.gz
portage-4fef960c0b3681ea5389e3a639ab1e30115c2021.tar.bz2
portage-4fef960c0b3681ea5389e3a639ab1e30115c2021.zip
doebuild_environment: remove unused eapi parsing
-rw-r--r--pym/portage/package/ebuild/doebuild.py20
1 files changed, 2 insertions, 18 deletions
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index 4f7d4a8a1..53b7080bc 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -31,7 +31,7 @@ portage.proxy.lazyimport.lazyimport(globals(),
from portage import auxdbkeys, bsd_chflags, \
eapi_is_supported, merge, os, selinux, shutil, \
- unmerge, _encodings, _parse_eapi_ebuild_head, _os_merge, \
+ unmerge, _encodings, _os_merge, \
_shell_quote, _unicode_decode, _unicode_encode
from portage.const import EBUILD_SH_ENV_FILE, EBUILD_SH_ENV_DIR, \
EBUILD_SH_BINARY, INVALID_ENV_FILE, MISC_SH_BINARY
@@ -335,27 +335,11 @@ def doebuild_environment(myebuild, mydo, myroot=None, settings=None,
# like PORTAGE_BUILDDIR are still initialized even in cases when
# UnsupportedAPIException needs to be raised, which can be useful
# when uninstalling a package that has corrupt EAPI metadata.
- eapi = None
- if mydo == 'depend' and 'EAPI' not in mysettings.configdict['pkg']:
- if eapi is None:
- with io.open(_unicode_encode(ebuild_path,
- encoding=_encodings['fs'], errors='strict'),
- mode='r', encoding=_encodings['content'],
- errors='replace') as f:
- eapi, eapi_lineno = _parse_eapi_ebuild_head(f)
- if eapi is None:
- eapi = "0"
-
- if eapi is not None:
- if not eapi_is_supported(eapi):
- _doebuild_path(mysettings)
- raise UnsupportedAPIException(mycpv, eapi)
- mysettings.configdict['pkg']['EAPI'] = eapi
+ eapi = mysettings.configdict['pkg'].get('EAPI')
if mydo != "depend":
# Metadata vars such as EAPI and RESTRICT are
# set by the above config.setcpv() call.
- eapi = mysettings["EAPI"]
if not eapi_is_supported(eapi):
# can't do anything with this.
_doebuild_path(mysettings)