[gentoo-commits] proj/portage:master commit in: lib/portage/dbapi/

[Zac Medico]

commit:     3d39e6891a3ee002fb1aa039c5660e6015c555d2
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 13:24:21 2021 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 13:27:25 2021 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=3d39e689

bindbapi.move_ent: use cpv_exists instead of getname

The getname method is complicated by binpkg-multi-instance
and soon BINPKG_FORMAT, so it's much simpler to use
cpv_exists.

Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 lib/portage/dbapi/bintree.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/portage/dbapi/bintree.py b/lib/portage/dbapi/bintree.py
index 528a68979..e5ba5893e 100644
--- a/lib/portage/dbapi/bintree.py
+++ b/lib/portage/dbapi/bintree.py
@@ -483,7 +483,7 @@ class binarytree:
                        myoldpkg = catsplit(mycpv)[1]
                        mynewpkg = catsplit(mynewcpv)[1]
 
-                       if (mynewpkg != myoldpkg) and 
os.path.exists(self.getname(mynewcpv)):
+                       if (mynewpkg != myoldpkg) and 
self.dbapi.cpv_exists(mynewcpv):
                                writemsg(_("!!! Cannot update binary: 
Destination exists.\n"),
                                        noiselevel=-1)
                                writemsg("!!! "+mycpv+" -> "+mynewcpv+"\n", 
noiselevel=-1)