On Wed, 1 Apr 2015 11:40:35 -0700 Zac Medico <zmed...@gentoo.org> wrote:
> When binpkg-multi-instance support was added in commit > 328dd4712f88cbb8ef390ae9eb471afa1ef781d7, the code that adjusts > self._pkg_paths in binarytree.move_ent was not fixed to account for > the extra directory in the path. > > Fixes: 328dd4712f88 ("binpkg-multi-instance 3 of 7") > X-Gentoo-Bug: 545252 > X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=545252 > --- > pym/portage/dbapi/bintree.py | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/pym/portage/dbapi/bintree.py > b/pym/portage/dbapi/bintree.py index 2f0bc47..b37f388 100644 > --- a/pym/portage/dbapi/bintree.py > +++ b/pym/portage/dbapi/bintree.py > @@ -462,8 +462,7 @@ class binarytree(object): > mynewcpv = _pkg_str(mynewcpv, > metadata=metadata) new_path = self.getname(mynewcpv) > self._pkg_paths[ > - self.dbapi._instance_key(mynewcpv)] > = os.path.join( > - *new_path.split(os.path.sep)[-2:]) > + self.dbapi._instance_key(mynewcpv)] > = new_path[len(self.pkgdir)+1:] if new_path != mytbz2: > self._ensure_dir(os.path.dirname(new_path)) > _movefile(tbz2path, new_path, > mysettings=self.settings) merge it please :) -- Brian Dolbec <dolsen>