| 1 |
--- |
| 2 |
pym/_emerge/EbuildExecuter.py | 4 ---- |
| 3 |
pym/_emerge/EbuildPhase.py | 6 ++++-- |
| 4 |
2 files changed, 4 insertions(+), 6 deletions(-) |
| 5 |
|
| 6 |
diff --git a/pym/_emerge/EbuildExecuter.py b/pym/_emerge/EbuildExecuter.py |
| 7 |
index ab79ce901..d387b42be 100644 |
| 8 |
--- a/pym/_emerge/EbuildExecuter.py |
| 9 |
+++ b/pym/_emerge/EbuildExecuter.py |
| 10 |
@@ -8,7 +8,6 @@ import portage |
| 11 |
from portage import os |
| 12 |
from portage.eapi import eapi_has_src_prepare_and_src_configure, \ |
| 13 |
eapi_exports_replace_vars |
| 14 |
-from portage.package.ebuild.prepare_build_dirs import _prepare_fake_distdir |
| 15 |
|
| 16 |
class EbuildExecuter(CompositeTask): |
| 17 |
|
| 18 |
@@ -25,9 +24,6 @@ class EbuildExecuter(CompositeTask): |
| 19 |
cleanup = 0 |
| 20 |
portage.prepare_build_dirs(pkg.root, settings, cleanup) |
| 21 |
|
| 22 |
- alist = settings.configdict["pkg"].get("A", "").split() |
| 23 |
- _prepare_fake_distdir(settings, alist) |
| 24 |
- |
| 25 |
if eapi_exports_replace_vars(settings['EAPI']): |
| 26 |
vardb = pkg.root_config.trees['vartree'].dbapi |
| 27 |
settings["REPLACING_VERSIONS"] = " ".join( |
| 28 |
diff --git a/pym/_emerge/EbuildPhase.py b/pym/_emerge/EbuildPhase.py |
| 29 |
index aa3a66831..d3fada622 100644 |
| 30 |
--- a/pym/_emerge/EbuildPhase.py |
| 31 |
+++ b/pym/_emerge/EbuildPhase.py |
| 32 |
@@ -1,4 +1,4 @@ |
| 33 |
-# Copyright 1999-2013 Gentoo Foundation |
| 34 |
+# Copyright 1999-2018 Gentoo Foundation |
| 35 |
# Distributed under the terms of the GNU General Public License v2 |
| 36 |
|
| 37 |
import gzip |
| 38 |
@@ -12,7 +12,7 @@ from _emerge.MiscFunctionsProcess import MiscFunctionsProcess |
| 39 |
from _emerge.EbuildProcess import EbuildProcess |
| 40 |
from _emerge.CompositeTask import CompositeTask |
| 41 |
from portage.package.ebuild.prepare_build_dirs import (_prepare_workdir, |
| 42 |
- _prepare_fake_filesdir) |
| 43 |
+ _prepare_fake_distdir, _prepare_fake_filesdir) |
| 44 |
from portage.util import writemsg |
| 45 |
|
| 46 |
try: |
| 47 |
@@ -171,6 +171,8 @@ class EbuildPhase(CompositeTask): |
| 48 |
def _start_ebuild(self): |
| 49 |
|
| 50 |
if self.phase == "unpack": |
| 51 |
+ alist = self.settings.configdict["pkg"].get("A", "").split() |
| 52 |
+ _prepare_fake_distdir(self.settings, alist) |
| 53 |
_prepare_fake_filesdir(self.settings) |
| 54 |
|
| 55 |
fd_pipes = self.fd_pipes |
| 56 |
-- |
| 57 |
2.16.1 |
Archives