| 1 |
commit: c2bebcc4cb631c9c0478bf7545cbe317a72bcd34 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Apr 1 18:39:31 2015 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 1 19:15:50 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=c2bebcc4 |
| 7 |
|
| 8 |
binarytree.move_ent: fix binpkg-multi-instance _pkg_paths corruption (bug 545252) |
| 9 |
|
| 10 |
When binpkg-multi-instance support was added in commit |
| 11 |
328dd4712f88cbb8ef390ae9eb471afa1ef781d7, the code that adjusts |
| 12 |
self._pkg_paths in binarytree.move_ent was not fixed to account for the |
| 13 |
extra directory in the path. |
| 14 |
|
| 15 |
Fixes: 328dd4712f88 ("binpkg-multi-instance 3 of 7") |
| 16 |
X-Gentoo-Bug: 545252 |
| 17 |
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=545252 |
| 18 |
Acked-by: Brian Dolbec <dolsen <AT> gentoo.org> |
| 19 |
|
| 20 |
pym/portage/dbapi/bintree.py | 3 +-- |
| 21 |
1 file changed, 1 insertion(+), 2 deletions(-) |
| 22 |
|
| 23 |
diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py |
| 24 |
index 2f0bc47..b37f388 100644 |
| 25 |
--- a/pym/portage/dbapi/bintree.py |
| 26 |
+++ b/pym/portage/dbapi/bintree.py |
| 27 |
@@ -462,8 +462,7 @@ class binarytree(object): |
| 28 |
mynewcpv = _pkg_str(mynewcpv, metadata=metadata) |
| 29 |
new_path = self.getname(mynewcpv) |
| 30 |
self._pkg_paths[ |
| 31 |
- self.dbapi._instance_key(mynewcpv)] = os.path.join( |
| 32 |
- *new_path.split(os.path.sep)[-2:]) |
| 33 |
+ self.dbapi._instance_key(mynewcpv)] = new_path[len(self.pkgdir)+1:] |
| 34 |
if new_path != mytbz2: |
| 35 |
self._ensure_dir(os.path.dirname(new_path)) |
| 36 |
_movefile(tbz2path, new_path, mysettings=self.settings) |
Archives