| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-24 22:24:58 +0000 (Sat, 24 May 2008) |
| 3 |
New Revision: 10395 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/dep.py |
| 7 |
Log: |
| 8 |
Fix broken dep_getusedeps() cache behavior so that it returns the |
| 9 |
correct type. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/dep.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/dep.py 2008-05-24 22:03:27 UTC (rev 10394) |
| 15 |
+++ main/trunk/pym/portage/dep.py 2008-05-24 22:24:58 UTC (rev 10395) |
| 16 |
@@ -345,6 +345,7 @@ |
| 17 |
disabled_flags.append(x[1:]) |
| 18 |
else: |
| 19 |
enabled_flags.append(x) |
| 20 |
+ self.tokens = use |
| 21 |
self.enabled = frozenset(enabled_flags) |
| 22 |
self.disabled = frozenset(disabled_flags) |
| 23 |
self.required = self.enabled.union(self.disabled) |
| 24 |
@@ -499,8 +500,8 @@ |
| 25 |
@return: List of use flags ( or [] if no flags exist ) |
| 26 |
""" |
| 27 |
use = getattr(depend, "use", None) |
| 28 |
- if use is not None: |
| 29 |
- return use |
| 30 |
+ if use is not None and hasattr(use, "tokens"): |
| 31 |
+ return use.tokens |
| 32 |
use_list = [] |
| 33 |
open_bracket = depend.find('[') |
| 34 |
# -1 = failure (think c++ string::npos) |
| 35 |
|
| 36 |
-- |
| 37 |
gentoo-commits@l.g.o mailing list |
Archives