[gentoo-portage-dev] [PATCH] prepare_build_dirs: Fix duplicate override of DISTDIR for 'ebuild'

[Michał Górny]

Fix the duplicate override of DISTDIR that happens when using
the 'ebuild' tool to run ebuilds. In this case, both the 'config'
code and the 'prepare_build_dirs' code attempt to replace DISTDIR,
and the shadow distdir symlinks end up pointing to themselves.

Apparently the _prepare_fake_distdir() is passed settings containing
the original DISTDIR by emerge, while ebuild passes an instance
contaning the DISTDIR override. Try PORTAGE_ACTUAL_DISTDIR first
to account for both cases.
---
 pym/portage/package/ebuild/prepare_build_dirs.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pym/portage/package/ebuild/prepare_build_dirs.py b/pym/portage/package/ebuild/prepare_build_dirs.py
index 16afc3f98..0b6a3a4df 100644
--- a/pym/portage/package/ebuild/prepare_build_dirs.py
+++ b/pym/portage/package/ebuild/prepare_build_dirs.py
@@ -411,10 +411,10 @@ def _prepare_fake_filesdir(settings):
 			os.symlink(real_filesdir, symlink_path)
 
 def _prepare_fake_distdir(settings, alist):
-	orig_distdir = settings["DISTDIR"]
-	settings["PORTAGE_ACTUAL_DISTDIR"] = orig_distdir
-	edpath = settings["DISTDIR"] = \
-		os.path.join(settings["PORTAGE_BUILDDIR"], "distdir")
+	orig_distdir = settings.get("PORTAGE_ACTUAL_DISTDIR",
+			settings.get("DISTDIR"))
+	assert orig_distdir
+	edpath = os.path.join(settings["PORTAGE_BUILDDIR"], "distdir")
 	portage.util.ensure_dirs(edpath, gid=portage_gid, mode=0o755)
 
 	# Remove any unexpected files or directories.
-- 
2.16.1