| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-30 01:09:13 +0000 (Fri, 30 May 2008) |
| 3 |
New Revision: 10500 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/pym/portage_dep.py |
| 7 |
Log: |
| 8 |
Simplify None Package.slot handling in match_from_list(). (trunk r10499) |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/branches/2.1.2/pym/portage_dep.py |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.2/pym/portage_dep.py 2008-05-30 01:08:35 UTC (rev 10499) |
| 14 |
+++ main/branches/2.1.2/pym/portage_dep.py 2008-05-30 01:09:13 UTC (rev 10500) |
| 15 |
@@ -725,8 +725,8 @@ |
| 16 |
candidate_list = mylist |
| 17 |
mylist = [] |
| 18 |
for x in candidate_list: |
| 19 |
- xslot = getattr(x, "slot", None) |
| 20 |
- if xslot is None and isinstance(x, basestring): |
| 21 |
+ xslot = getattr(x, "slot", False) |
| 22 |
+ if xslot is False: |
| 23 |
xslot = dep_getslot(x) |
| 24 |
if xslot is not None and xslot != slot: |
| 25 |
continue |
| 26 |
|
| 27 |
-- |
| 28 |
gentoo-commits@l.g.o mailing list |
Archives