1 |
Fix the duplicate override of DISTDIR that happens when using |
2 |
the 'ebuild' tool to run ebuilds. In this case, both the 'config' |
3 |
code and the 'prepare_build_dirs' code attempt to replace DISTDIR, |
4 |
and the shadow distdir symlinks end up pointing to themselves. |
5 |
|
6 |
As suggested by Zac Medico, after removing this override DISTDIR |
7 |
in settings will always be the real directory, so there is no need |
8 |
for a PORTAGE_ACTUAL_DISTDIR check here. |
9 |
--- |
10 |
pym/portage/package/ebuild/prepare_build_dirs.py | 4 +--- |
11 |
1 file changed, 1 insertion(+), 3 deletions(-) |
12 |
|
13 |
diff --git a/pym/portage/package/ebuild/prepare_build_dirs.py b/pym/portage/package/ebuild/prepare_build_dirs.py |
14 |
index 16afc3f98..21e2aa87c 100644 |
15 |
--- a/pym/portage/package/ebuild/prepare_build_dirs.py |
16 |
+++ b/pym/portage/package/ebuild/prepare_build_dirs.py |
17 |
@@ -412,9 +412,7 @@ def _prepare_fake_filesdir(settings): |
18 |
|
19 |
def _prepare_fake_distdir(settings, alist): |
20 |
orig_distdir = settings["DISTDIR"] |
21 |
- settings["PORTAGE_ACTUAL_DISTDIR"] = orig_distdir |
22 |
- edpath = settings["DISTDIR"] = \ |
23 |
- os.path.join(settings["PORTAGE_BUILDDIR"], "distdir") |
24 |
+ edpath = os.path.join(settings["PORTAGE_BUILDDIR"], "distdir") |
25 |
portage.util.ensure_dirs(edpath, gid=portage_gid, mode=0o755) |
26 |
|
27 |
# Remove any unexpected files or directories. |
28 |
-- |
29 |
2.16.1 |