Remove unnecessary call to _prepare_env_file(), since it only makes
authorZac Medico <zmedico@gentoo.org>
Wed, 18 Aug 2010 22:42:58 +0000 (15:42 -0700)
committerZac Medico <zmedico@gentoo.org>
Wed, 18 Aug 2010 22:42:58 +0000 (15:42 -0700)
sense for binary or installed packages.

pym/_emerge/EbuildExecuter.py

index 513e6701955f5fceffe1db0ebb00df1b6b0e8dca..419ee6b1a8d83a709f29c8a3d0fb91de7b9b4ef3 100644 (file)
@@ -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']