From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AD6931381F1 for ; Fri, 26 Jan 2018 14:59:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C76E5E08FE; Fri, 26 Jan 2018 14:59:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A6956E08FE for ; Fri, 26 Jan 2018 14:59:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 64CC1335C2E for ; Fri, 26 Jan 2018 14:59:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 23E941D0 for ; Fri, 26 Jan 2018 14:59:07 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1516978740.eab2edb8b513ba62e8d7ce3bd03c4a686d77cc2c.mgorny@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/EbuildExecuter.py pym/_emerge/EbuildPhase.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: eab2edb8b513ba62e8d7ce3bd03c4a686d77cc2c X-VCS-Branch: master Date: Fri, 26 Jan 2018 14:59:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 74cd89c6-6dd2-4960-b609-6355c8e09a5a X-Archives-Hash: dac8012bcfdb11611984e63bcb627571 commit: eab2edb8b513ba62e8d7ce3bd03c4a686d77cc2c Author: Michał Górny gentoo org> AuthorDate: Thu Jan 25 08:32:40 2018 +0000 Commit: Michał Górny gentoo 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 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