From 1393a06e68c54cb53244f6f918660b42a8567b6b Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 25 Dec 2008 01:20:52 +0000 Subject: Fix PATH comparison in binarytree.inject() some more. (trunk r12295) svn path=/main/branches/2.1.6/; revision=12315 --- pym/portage/dbapi/bintree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py index 87611bf06..9b6953b79 100644 --- a/pym/portage/dbapi/bintree.py +++ b/pym/portage/dbapi/bintree.py @@ -864,7 +864,7 @@ class binarytree(object): path = d.get("PATH", "") for i in xrange(len(pkgindex.packages) - 1, -1, -1): d2 = pkgindex.packages[i] - if path is not None and path == d2.get("PATH"): + if path and path == d2.get("PATH"): # Handle path collisions in $PKGDIR/All # when CPV is not identical. del pkgindex.packages[i] -- cgit v1.2.3-1-g7c22