diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-09-21 11:26:27 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-21 11:28:15 -0700 |
| commit | 0b93f0be11b3bf25a556e48b797f6d600d353e1b (patch) | |
| tree | 926f76a3575a2c3100c16a7e5eac1f6eb2eb6444 | |
| parent | bf5877484cbca0b59c1b9d3688d338465083bcf9 (diff) | |
| download | portage-0b93f0be11b3bf25a556e48b797f6d600d353e1b.tar.gz portage-0b93f0be11b3bf25a556e48b797f6d600d353e1b.tar.bz2 portage-0b93f0be11b3bf25a556e48b797f6d600d353e1b.zip | |
Bug #338267 - Fix broken PORTAGE_BUILDDIR assertion in Binpkg when
PORTAGE_TMPDIR is a symlink.
| -rw-r--r-- | pym/_emerge/Binpkg.py | 4 |
1 files changed, 3 insertions, 1 deletions
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") |