| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-30 00:38:22 +0000 (Fri, 30 May 2008) |
| 3 |
New Revision: 10498 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/pym/portage_dep.py |
| 7 |
Log: |
| 8 |
Fix Atom attribute handling in get_operator() and dep_getslot() to account |
| 9 |
for None return values. (trunk r10497) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.2/pym/portage_dep.py |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.2/pym/portage_dep.py 2008-05-30 00:37:34 UTC (rev 10497) |
| 15 |
+++ main/branches/2.1.2/pym/portage_dep.py 2008-05-30 00:38:22 UTC (rev 10498) |
| 16 |
@@ -310,8 +310,8 @@ |
| 17 |
@return: The operator. One of: |
| 18 |
'~', '=', '>', '<', '=*', '>=', or '<=' |
| 19 |
""" |
| 20 |
- operator = getattr(mydep, "operator", None) |
| 21 |
- if operator is not None: |
| 22 |
+ operator = getattr(mydep, "operator", False) |
| 23 |
+ if operator is not False: |
| 24 |
return operator |
| 25 |
if mydep: |
| 26 |
mydep = remove_slot(mydep) |
| 27 |
@@ -385,8 +385,8 @@ |
| 28 |
@rtype: String |
| 29 |
@return: The slot |
| 30 |
""" |
| 31 |
- slot = getattr(mydep, "slot", None) |
| 32 |
- if slot is not None: |
| 33 |
+ slot = getattr(mydep, "slot", False) |
| 34 |
+ if slot is not False: |
| 35 |
return slot |
| 36 |
colon = mydep.find(":") |
| 37 |
if colon != -1: |
| 38 |
|
| 39 |
-- |
| 40 |
gentoo-commits@l.g.o mailing list |
Archives