summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-18 15:42:58 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-18 15:42:58 -0700
commit31cca99d48004d74ccac68de478eadef0a3ce83e (patch)
tree3bd99c18eb5d2e1d7dbd7e3db9027ec591b9fe30
parentdf2c91cfdfbb827b61d4d3b7de6817a9ccd31a5d (diff)
downloadportage-31cca99d48004d74ccac68de478eadef0a3ce83e.tar.gz
portage-31cca99d48004d74ccac68de478eadef0a3ce83e.tar.bz2
portage-31cca99d48004d74ccac68de478eadef0a3ce83e.zip
Remove unnecessary call to _prepare_env_file(), since it only makes
sense for binary or installed packages.
-rw-r--r--pym/_emerge/EbuildExecuter.py9
1 files changed, 1 insertions, 8 deletions
diff --git a/pym/_emerge/EbuildExecuter.py b/pym/_emerge/EbuildExecuter.py
index 513e67019..419ee6b1a 100644
--- a/pym/_emerge/EbuildExecuter.py
+++ b/pym/_emerge/EbuildExecuter.py
@@ -8,8 +8,7 @@ import portage
from portage import os
from portage.eapi import eapi_has_src_prepare_and_src_configure, \
eapi_exports_replace_vars
-from portage.package.ebuild.doebuild import _prepare_env_file, \
- _prepare_fake_distdir
+from portage.package.ebuild.doebuild import _prepare_fake_distdir
class EbuildExecuter(CompositeTask):
@@ -33,12 +32,6 @@ class EbuildExecuter(CompositeTask):
settings = self.settings
cleanup = 0
portage.prepare_build_dirs(pkg.root, settings, cleanup)
- rval = _prepare_env_file(settings)
- if rval != os.EX_OK:
- self.returncode = rval
- self._current_task = None
- self.wait()
- return
portdb = pkg.root_config.trees['porttree'].dbapi
ebuild_path = settings['EBUILD']