Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r12315 - main/branches/2.1.6/pym/portage/dbapi
Date: Thu, 25 Dec 2008 01:20:54
Message-Id: E1LFeuC-0001b6-VV@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-12-25 01:20:52 +0000 (Thu, 25 Dec 2008)
3 New Revision: 12315
4
5 Modified:
6 main/branches/2.1.6/pym/portage/dbapi/bintree.py
7 Log:
8 Fix PATH comparison in binarytree.inject() some more. (trunk r12295)
9
10 Modified: main/branches/2.1.6/pym/portage/dbapi/bintree.py
11 ===================================================================
12 --- main/branches/2.1.6/pym/portage/dbapi/bintree.py 2008-12-25 01:20:42 UTC (rev 12314)
13 +++ main/branches/2.1.6/pym/portage/dbapi/bintree.py 2008-12-25 01:20:52 UTC (rev 12315)
14 @@ -864,7 +864,7 @@
15 path = d.get("PATH", "")
16 for i in xrange(len(pkgindex.packages) - 1, -1, -1):
17 d2 = pkgindex.packages[i]
18 - if path is not None and path == d2.get("PATH"):
19 + if path and path == d2.get("PATH"):
20 # Handle path collisions in $PKGDIR/All
21 # when CPV is not identical.
22 del pkgindex.packages[i]