Bug #338267 - Fix broken PORTAGE_BUILDDIR assertion in Binpkg when

PORTAGE_TMPDIR is a symlink.

diff --git a/pym/_emerge/Binpkg.py b/pym/_emerge/Binpkg.py
index 06f0fd28c8ad05b3ccc4aceb5b78bf655f51a495..aadd625bf2e515a4d94628103ed7025763fb13ff 100644 (file)
--- a/pym/_emerge/Binpkg.py
+++ b/pym/_emerge/Binpkg.py
@@ -39,7 +39,9 @@ class Binpkg(CompositeTask):
                self._bintree = self.pkg.root_config.trees[self._tree]
                self._verify = not self.opts.pretend
 
-               dir_path = os.path.join(settings["PORTAGE_TMPDIR"],
+               # Use realpath like doebuild_environment() does, since we assert
+               # that this is path is literally identical to PORTAGE_BUILDDIR.
+               dir_path = os.path.join(os.path.realpath(settings["PORTAGE_TMPDIR"]),
                        "portage", pkg.category, pkg.pf)
                self._image_dir = os.path.join(dir_path, "image")
                self._infloc = os.path.join(dir_path, "build-info")