1 |
Author: zmedico |
2 |
Date: 2008-05-30 01:08:35 +0000 (Fri, 30 May 2008) |
3 |
New Revision: 10499 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/portage/dep.py |
7 |
Log: |
8 |
Simplify None Package.slot handling in match_from_list(). |
9 |
|
10 |
|
11 |
Modified: main/trunk/pym/portage/dep.py |
12 |
=================================================================== |
13 |
--- main/trunk/pym/portage/dep.py 2008-05-30 00:38:22 UTC (rev 10498) |
14 |
+++ main/trunk/pym/portage/dep.py 2008-05-30 01:08:35 UTC (rev 10499) |
15 |
@@ -885,8 +885,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 |