From 0b93f0be11b3bf25a556e48b797f6d600d353e1b Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 21 Sep 2010 11:26:27 -0700 Subject: Bug #338267 - Fix broken PORTAGE_BUILDDIR assertion in Binpkg when PORTAGE_TMPDIR is a symlink. --- pym/_emerge/Binpkg.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pym/_emerge/Binpkg.py') diff --git a/pym/_emerge/Binpkg.py b/pym/_emerge/Binpkg.py index 06f0fd28c..aadd625bf 100644 --- 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") -- cgit v1.2.3-1-g7c22