Fix PATH comparison in binarytree.inject() some more.

svn path=/main/trunk/; revision=12295

diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index 87611bf06fc5db25d1f960fdedb9c1cc7f2550d4..9b6953b791f4b466747a799bd76bd56b9e1fbbd3 100644 (file)
--- 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]