| 1 |
Author: zmedico |
| 2 |
Date: 2008-12-25 01:20:42 +0000 (Thu, 25 Dec 2008) |
| 3 |
New Revision: 12314 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/pym/portage/dbapi/bintree.py |
| 7 |
Log: |
| 8 |
Fix broken PATH comparisons when eliminating duplicate entries inside |
| 9 |
binarytree.inject(). (trunk r12294) |
| 10 |
|
| 11 |
Modified: main/branches/2.1.6/pym/portage/dbapi/bintree.py |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.6/pym/portage/dbapi/bintree.py 2008-12-25 01:20:27 UTC (rev 12313) |
| 14 |
+++ main/branches/2.1.6/pym/portage/dbapi/bintree.py 2008-12-25 01:20:42 UTC (rev 12314) |
| 15 |
@@ -861,14 +861,14 @@ |
| 16 |
return |
| 17 |
|
| 18 |
# If found, remove package(s) with duplicate path. |
| 19 |
- path = d.get("PATH") |
| 20 |
+ path = d.get("PATH", "") |
| 21 |
for i in xrange(len(pkgindex.packages) - 1, -1, -1): |
| 22 |
d2 = pkgindex.packages[i] |
| 23 |
if path is not None and path == d2.get("PATH"): |
| 24 |
# Handle path collisions in $PKGDIR/All |
| 25 |
# when CPV is not identical. |
| 26 |
del pkgindex.packages[i] |
| 27 |
- elif cpv == d2.get("CPV") and path == d2.get("PATH"): |
| 28 |
+ elif cpv == d2.get("CPV") and path == d2.get("PATH", ""): |
| 29 |
del pkgindex.packages[i] |
| 30 |
pkgindex.packages.append(d) |
Archives