diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-12-24 01:15:01 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-12-24 01:15:01 +0000 |
| commit | a2207e0894aba212db0c81b774d3fccd888af972 (patch) | |
| tree | 89b4aa2ad0f629762516d09ac4b34c92dd08f8ec | |
| parent | 41438b430b6959451fce99d1152591c4ff082c3b (diff) | |
| download | portage-a2207e0894aba212db0c81b774d3fccd888af972.tar.gz portage-a2207e0894aba212db0c81b774d3fccd888af972.tar.bz2 portage-a2207e0894aba212db0c81b774d3fccd888af972.zip | |
Fix broken PATH comparisons when eliminating duplicate entries inside
binarytree.inject().
svn path=/main/trunk/; revision=12294
| -rw-r--r-- | pym/portage/dbapi/bintree.py | 4 |
1 files changed, 2 insertions, 2 deletions
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) |