Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/dbapi/
Date: Tue, 08 Sep 2020 02:52:33
Message-Id: 1599533086.6a3bdcc427c58112075c36cc0481c53215f12db4.zmedico@gentoo
1 commit: 6a3bdcc427c58112075c36cc0481c53215f12db4
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 8 02:43:23 2020 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 8 02:44:46 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=6a3bdcc4
7
8 binarytree.move_ent: fix path comparison prior to _movefile
9
10 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
11
12 lib/portage/dbapi/bintree.py | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15 diff --git a/lib/portage/dbapi/bintree.py b/lib/portage/dbapi/bintree.py
16 index e4393e06d..7e24589e5 100644
17 --- a/lib/portage/dbapi/bintree.py
18 +++ b/lib/portage/dbapi/bintree.py
19 @@ -531,7 +531,7 @@ class binarytree:
20 new_path = self.getname(mynewcpv)
21 self._pkg_paths[
22 self.dbapi._instance_key(mynewcpv)] = new_path[len(self.pkgdir)+1:]
23 - if new_path != mytbz2:
24 + if new_path != tbz2path:
25 self._ensure_dir(os.path.dirname(new_path))
26 _movefile(tbz2path, new_path, mysettings=self.settings)
27 self.inject(mynewcpv)