[gentoo-commits] proj/portage:master commit in: pym/_emerge/

[Michał Górny]

commit:     eab2edb8b513ba62e8d7ce3bd03c4a686d77cc2c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 25 08:32:40 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 26 14:59:00 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=eab2edb8

_emerge.Ebuild*: delay creating DISTDIR shadow until src_unpack

Reviewed-by: Zac Medico <zmedico <AT> gentoo.org>

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

diff --git a/pym/_emerge/EbuildExecuter.py b/pym/_emerge/EbuildExecuter.py
index ab79ce901..d387b42be 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 aa3a66831..d3fada622 100644
--- a/pym/_emerge/EbuildPhase.py
+++ b/pym/_emerge/EbuildPhase.py
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 import gzip
@@ -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:
@@ -171,6 +171,8 @@ class EbuildPhase(CompositeTask):
        def _start_ebuild(self):
 
                if self.phase == "unpack":
+                       alist = self.settings.configdict["pkg"].get("A", 
"").split()
+                       _prepare_fake_distdir(self.settings, alist)
                        _prepare_fake_filesdir(self.settings)
 
                fd_pipes = self.fd_pipes