From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 24 Dec 2008 01:15:01 +0000 (-0000)
Subject: Fix broken PATH comparisons when eliminating duplicate entries inside
X-Git-Tag: v2.2_rc19~17
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a2207e0894aba212db0c81b774d3fccd888af972;p=portage.git

Fix broken PATH comparisons when eliminating duplicate entries inside
binarytree.inject().

svn path=/main/trunk/; revision=12294
---

diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index edba51a39..87611bf06 100644
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -861,14 +861,14 @@ class binarytree(object):
 				return
 
 			# If found, remove package(s) with duplicate path.
-			path = d.get("PATH")
+			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"):
 					# Handle path collisions in $PKGDIR/All
 					# when CPV is not identical.
 					del pkgindex.packages[i]
-				elif cpv == d2.get("CPV") and path == d2.get("PATH"):
+				elif cpv == d2.get("CPV") and path == d2.get("PATH", ""):
 					del pkgindex.packages[i]
 			pkgindex.packages.append(d)