aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2015-04-01 11:39:31 -0700
committerZac Medico <zmedico@gentoo.org>2015-04-01 12:15:50 -0700
commitc2bebcc4cb631c9c0478bf7545cbe317a72bcd34 (patch)
tree400c7cd0c859337fbbdbade997078d026e07ce91
parentrepoman: add --straight-to-stable (-S) option (diff)
downloadportage-c2bebcc4cb631c9c0478bf7545cbe317a72bcd34.tar.gz
portage-c2bebcc4cb631c9c0478bf7545cbe317a72bcd34.tar.bz2
portage-c2bebcc4cb631c9c0478bf7545cbe317a72bcd34.zip
binarytree.move_ent: fix binpkg-multi-instance _pkg_paths corruption (bug 545252)
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 Acked-by: Brian Dolbec <dolsen@gentoo.org>
-rw-r--r--pym/portage/dbapi/bintree.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index 2f0bc4705..b37f38856 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)