| 1 |
commit: 15b6dad42b78ac3582de909c2ed85861e18f5727 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 29 19:47:54 2011 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 29 19:47:54 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=15b6dad4 |
| 7 |
|
| 8 |
Drop the default property from PMUseFlag. |
| 9 |
|
| 10 |
It is not really useful and troublesome to maintain. |
| 11 |
|
| 12 |
--- |
| 13 |
gentoopm/basepm/pkg.py | 15 +-------------- |
| 14 |
gentoopm/paludispm/pkg.py | 16 ++++------------ |
| 15 |
2 files changed, 5 insertions(+), 26 deletions(-) |
| 16 |
|
| 17 |
diff --git a/gentoopm/basepm/pkg.py b/gentoopm/basepm/pkg.py |
| 18 |
index 397ff7f..efb80e7 100644 |
| 19 |
--- a/gentoopm/basepm/pkg.py |
| 20 |
+++ b/gentoopm/basepm/pkg.py |
| 21 |
@@ -82,20 +82,7 @@ class PMUseFlag(ABCObject, StringCompat): |
| 22 |
@param usestr: the IUSE atom (C{[+-]?flag}) |
| 23 |
@type usestr: string |
| 24 |
""" |
| 25 |
- self._default = None |
| 26 |
- if usestr[0] in ('-', '+'): |
| 27 |
- self._default = (usestr[0] == '+') |
| 28 |
- usestr = usestr[1:] |
| 29 |
- self._name = usestr |
| 30 |
- |
| 31 |
- @property |
| 32 |
- def default(self): |
| 33 |
- """ |
| 34 |
- The default state, if provided by the ebuild. |
| 35 |
- |
| 36 |
- @type: bool/C{None} |
| 37 |
- """ |
| 38 |
- return self._default |
| 39 |
+ self._name = usestr.lstrip('+-') |
| 40 |
|
| 41 |
@property |
| 42 |
def name(self): |
| 43 |
|
| 44 |
diff --git a/gentoopm/paludispm/pkg.py b/gentoopm/paludispm/pkg.py |
| 45 |
index fe680ee..0c5d567 100644 |
| 46 |
--- a/gentoopm/paludispm/pkg.py |
| 47 |
+++ b/gentoopm/paludispm/pkg.py |
| 48 |
@@ -41,29 +41,22 @@ class PaludisPackageDescription(PMPackageDescription): |
| 49 |
return k.parse_value() if k is not None else None |
| 50 |
|
| 51 |
class PaludisChoice(PMUseFlag): |
| 52 |
- def __init__(self, choice, default = None): |
| 53 |
+ def __init__(self, choice): |
| 54 |
self._c = choice |
| 55 |
- self._default = default |
| 56 |
- |
| 57 |
- @property |
| 58 |
- def default(self): |
| 59 |
- return self._default |
| 60 |
|
| 61 |
@property |
| 62 |
def name(self): |
| 63 |
return str(self._c.name_with_prefix) |
| 64 |
|
| 65 |
class PaludisChoiceSet(SpaceSepFrozenSet): |
| 66 |
- def __new__(self, choices, iuse): |
| 67 |
- iuse = SpaceSepFrozenSet([PMUseFlag(x) for x in iuse]) |
| 68 |
+ def __new__(self, choices): |
| 69 |
l = [] |
| 70 |
for group in choices: |
| 71 |
if group.raw_name == 'build_options': # paludis specific |
| 72 |
continue |
| 73 |
for c in group: |
| 74 |
if c.explicitly_listed: |
| 75 |
- miuse = iuse[str(c.name_with_prefix)] |
| 76 |
- l.append(PaludisChoice(c, miuse.default)) |
| 77 |
+ l.append(PaludisChoice(c)) |
| 78 |
return SpaceSepFrozenSet.__new__(self, l) |
| 79 |
|
| 80 |
class PaludisID(PMPackage, PaludisAtom): |
| 81 |
@@ -173,8 +166,7 @@ class PaludisID(PMPackage, PaludisAtom): |
| 82 |
@property |
| 83 |
def use(self): |
| 84 |
return PaludisChoiceSet( |
| 85 |
- self._get_meta(self._pkg.choices_key()), |
| 86 |
- self._get_meta('IUSE')) |
| 87 |
+ self._get_meta(self._pkg.choices_key())) |
| 88 |
|
| 89 |
@property |
| 90 |
def _atom(self): |
Archives