diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2008-12-25 01:20:42 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-12-25 01:20:42 +0000 |
| commit | 071b9c47448f42795776d887df113c0c27946d67 (patch) | |
| tree | 88933341a2925e9ed29bcd0ca4e6294aab4a8a8c | |
| parent | When removing entries with duplicate paths inside binarytree.inject(), handle (diff) | |
| download | portage-multirepo-071b9c47448f42795776d887df113c0c27946d67.tar.gz portage-multirepo-071b9c47448f42795776d887df113c0c27946d67.tar.bz2 portage-multirepo-071b9c47448f42795776d887df113c0c27946d67.zip | |
Fix broken PATH comparisons when eliminating duplicate entries inside
binarytree.inject(). (trunk r12294)
svn path=/main/branches/2.1.6/; revision=12314
| -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 edba51a3..87611bf0 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) |