From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5A122138821 for ; Wed, 1 Apr 2015 19:17:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42D4FE0A8A; Wed, 1 Apr 2015 19:17:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EBE62E0A8A for ; Wed, 1 Apr 2015 19:17:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ECF393407BB for ; Wed, 1 Apr 2015 19:17:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CD36E15016 for ; Wed, 1 Apr 2015 19:16:56 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1427915750.c2bebcc4cb631c9c0478bf7545cbe317a72bcd34.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/bintree.py X-VCS-Directories: pym/portage/dbapi/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: c2bebcc4cb631c9c0478bf7545cbe317a72bcd34 X-VCS-Branch: master Date: Wed, 1 Apr 2015 19:16:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 08717493-0904-4742-9d1a-4972d279516d X-Archives-Hash: 047053987bd6a39830f6859c7cec5a92 commit: c2bebcc4cb631c9c0478bf7545cbe317a72bcd34 Author: Zac Medico gentoo org> AuthorDate: Wed Apr 1 18:39:31 2015 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Apr 1 19:15:50 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=c2bebcc4 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 gentoo.org> 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)