summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-12-25 01:20:52 +0000
committerZac Medico <zmedico@gentoo.org>2008-12-25 01:20:52 +0000
commit1393a06e68c54cb53244f6f918660b42a8567b6b (patch)
tree0b6b49727891981bb92773f9a079f2151fe6275d
parent071b9c47448f42795776d887df113c0c27946d67 (diff)
downloadportage-1393a06e68c54cb53244f6f918660b42a8567b6b.tar.gz
portage-1393a06e68c54cb53244f6f918660b42a8567b6b.tar.bz2
portage-1393a06e68c54cb53244f6f918660b42a8567b6b.zip
Fix PATH comparison in binarytree.inject() some more. (trunk r12295)
svn path=/main/branches/2.1.6/; revision=12315
-rw-r--r--pym/portage/dbapi/bintree.py2
1 files changed, 1 insertions, 1 deletions
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]