[gentoo-portage-dev] [PATCH 4/4] _emerge.Ebuild*: delay creating DISTDIR shadow until src_unpack

[Michał Górny]

---
 pym/_emerge/EbuildExecuter.py | 4 ----
 pym/_emerge/EbuildPhase.py    | 4 +++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pym/_emerge/EbuildExecuter.py b/pym/_emerge/EbuildExecuter.py
index 7a454c3e6..81257aa9e 100644
--- a/pym/_emerge/EbuildExecuter.py
+++ b/pym/_emerge/EbuildExecuter.py
@@ -8,7 +8,6 @@ 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.prepare_build_dirs import _prepare_fake_distdir
 
 class EbuildExecuter(CompositeTask):
 
@@ -25,9 +24,6 @@ class EbuildExecuter(CompositeTask):
 		cleanup = 0
 		portage.prepare_build_dirs(pkg.root, settings, cleanup)
 
-		alist = settings.configdict["pkg"].get("A", "").split()
-		_prepare_fake_distdir(settings, alist)
-
 		if eapi_exports_replace_vars(settings['EAPI']):
 			vardb = pkg.root_config.trees['vartree'].dbapi
 			settings["REPLACING_VERSIONS"] = " ".join(
diff --git a/pym/_emerge/EbuildPhase.py b/pym/_emerge/EbuildPhase.py
index 4b5cbf8fa..535b64a9c 100644
--- a/pym/_emerge/EbuildPhase.py
+++ b/pym/_emerge/EbuildPhase.py
@@ -12,7 +12,7 @@ from _emerge.MiscFunctionsProcess import MiscFunctionsProcess
 from _emerge.EbuildProcess import EbuildProcess
 from _emerge.CompositeTask import CompositeTask
 from portage.package.ebuild.prepare_build_dirs import (_prepare_workdir,
-		_prepare_fake_filesdir)
+		_prepare_fake_distdir, _prepare_fake_filesdir)
 from portage.util import writemsg
 
 try:
@@ -131,6 +131,8 @@ class EbuildPhase(CompositeTask):
 			# source the ebuild as a fallback.
 
 		if self.phase == "unpack":
+			alist = self.settings.configdict["pkg"].get("A", "").split()
+			_prepare_fake_distdir(self.settings, alist)
 			_prepare_fake_filesdir(self.settings)
 
 		self._start_lock()
-- 
2.12.0