| 1 |
commit: bf623fe3a1dcab55c03e906b1be395d3b772a0eb |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 3 18:19:08 2012 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 3 18:19:08 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=bf623fe3 |
| 7 |
|
| 8 |
Paludis: update USEflag grepping API. |
| 9 |
|
| 10 |
--- |
| 11 |
gentoopm/paludispm/pkg.py | 9 +++++++-- |
| 12 |
1 files changed, 7 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/gentoopm/paludispm/pkg.py b/gentoopm/paludispm/pkg.py |
| 15 |
index ba34e5d..15b5995 100644 |
| 16 |
--- a/gentoopm/paludispm/pkg.py |
| 17 |
+++ b/gentoopm/paludispm/pkg.py |
| 18 |
@@ -59,8 +59,13 @@ class PaludisChoiceSet(SpaceSepFrozenSet): |
| 19 |
if group.raw_name == 'build_options': # paludis specific |
| 20 |
continue |
| 21 |
for c in group: |
| 22 |
- if c.explicitly_listed: |
| 23 |
- yield PaludisChoice(c) |
| 24 |
+ try: |
| 25 |
+ if c.origin != paludis.ChoiceOrigin.EXPLICIT: |
| 26 |
+ continue |
| 27 |
+ except AttributeError: |
| 28 |
+ if not c.explicitly_listed: |
| 29 |
+ continue |
| 30 |
+ yield PaludisChoice(c) |
| 31 |
|
| 32 |
self._choices = choices |
| 33 |
return SpaceSepFrozenSet.__new__(self, _get_iuse()) |
Archives