| 1 |
commit: 4c3fe4e1e04edfeea5c5151c5dc5b083546dbf86 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 28 14:10:10 2011 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 28 14:10:10 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=4c3fe4e1 |
| 7 |
|
| 8 |
OneOf -> AnyOf, to match PMS naming. |
| 9 |
|
| 10 |
--- |
| 11 |
gentoopm/basepm/depend.py | 10 +++++----- |
| 12 |
gentoopm/paludispm/depend.py | 6 +++--- |
| 13 |
gentoopm/pkgcorepm/depend.py | 10 +++++----- |
| 14 |
gentoopm/portagepm/depend.py | 10 +++++----- |
| 15 |
4 files changed, 18 insertions(+), 18 deletions(-) |
| 16 |
|
| 17 |
diff --git a/gentoopm/basepm/depend.py b/gentoopm/basepm/depend.py |
| 18 |
index 72ebb49..ca6d2c5 100644 |
| 19 |
--- a/gentoopm/basepm/depend.py |
| 20 |
+++ b/gentoopm/basepm/depend.py |
| 21 |
@@ -50,8 +50,8 @@ class PMUncondBaseDep(PMBaseDep): |
| 22 |
if d.enabled: |
| 23 |
for d in self._iter_deps(d): |
| 24 |
yield d |
| 25 |
- elif isinstance(d, PMOneOfDep): |
| 26 |
- yield PMUncondOneOfDep(d) |
| 27 |
+ elif isinstance(d, PMAnyOfDep): |
| 28 |
+ yield PMUncondAnyOfDep(d) |
| 29 |
else: |
| 30 |
yield d |
| 31 |
|
| 32 |
@@ -88,16 +88,16 @@ class PMAllOfDep(PMBaseDep): |
| 33 |
class PMUncondAllOfDep(PMAllOfDep, PMUncondBaseDep): |
| 34 |
pass |
| 35 |
|
| 36 |
-class PMOneOfDep(PMBaseDep): |
| 37 |
+class PMAnyOfDep(PMBaseDep): |
| 38 |
""" |
| 39 |
A one-of dependency set (C{|| ( ... )}). |
| 40 |
""" |
| 41 |
|
| 42 |
@property |
| 43 |
def without_conditionals(self): |
| 44 |
- return PMUncondOneOfDep(self) |
| 45 |
+ return PMUncondAnyOfDep(self) |
| 46 |
|
| 47 |
-class PMUncondOneOfDep(PMOneOfDep, PMUncondBaseDep): |
| 48 |
+class PMUncondAnyOfDep(PMAnyOfDep, PMUncondBaseDep): |
| 49 |
pass |
| 50 |
|
| 51 |
class PMPackageDepSet(PMAllOfDep): |
| 52 |
|
| 53 |
diff --git a/gentoopm/paludispm/depend.py b/gentoopm/paludispm/depend.py |
| 54 |
index d5e0069..976fa55 100644 |
| 55 |
--- a/gentoopm/paludispm/depend.py |
| 56 |
+++ b/gentoopm/paludispm/depend.py |
| 57 |
@@ -6,7 +6,7 @@ |
| 58 |
import paludis |
| 59 |
|
| 60 |
from gentoopm.basepm.depend import PMPackageDepSet, PMConditionalDep, \ |
| 61 |
- PMOneOfDep, PMAllOfDep, PMBaseDep |
| 62 |
+ PMAnyOfDep, PMAllOfDep, PMBaseDep |
| 63 |
from gentoopm.paludispm.atom import PaludisAtom |
| 64 |
|
| 65 |
class PaludisBaseDep(PMBaseDep): |
| 66 |
@@ -19,7 +19,7 @@ class PaludisBaseDep(PMBaseDep): |
| 67 |
if isinstance(d, paludis.PackageDepSpec): |
| 68 |
yield PaludisAtom(d, self._pkg._env) |
| 69 |
elif isinstance(d, paludis.AnyDepSpec): |
| 70 |
- yield PaludisOneOfDep(d, self._pkg) |
| 71 |
+ yield PaludisAnyOfDep(d, self._pkg) |
| 72 |
elif isinstance(d, paludis.AllDepSpec): |
| 73 |
yield PaludisAllOfDep(d, self._pkg) |
| 74 |
elif isinstance(d, paludis.ConditionalDepSpec): |
| 75 |
@@ -27,7 +27,7 @@ class PaludisBaseDep(PMBaseDep): |
| 76 |
else: |
| 77 |
raise NotImplementedError('Unable to parse %s' % repr(d)) |
| 78 |
|
| 79 |
-class PaludisOneOfDep(PMOneOfDep, PaludisBaseDep): |
| 80 |
+class PaludisAnyOfDep(PMAnyOfDep, PaludisBaseDep): |
| 81 |
pass |
| 82 |
|
| 83 |
class PaludisAllOfDep(PMAllOfDep, PaludisBaseDep): |
| 84 |
|
| 85 |
diff --git a/gentoopm/pkgcorepm/depend.py b/gentoopm/pkgcorepm/depend.py |
| 86 |
index ed69f64..8ebe6cf 100644 |
| 87 |
--- a/gentoopm/pkgcorepm/depend.py |
| 88 |
+++ b/gentoopm/pkgcorepm/depend.py |
| 89 |
@@ -8,7 +8,7 @@ from pkgcore.restrictions.boolean import OrRestriction, AndRestriction |
| 90 |
from pkgcore.restrictions.packages import Conditional |
| 91 |
|
| 92 |
from gentoopm.basepm.depend import PMPackageDepSet, PMConditionalDep, \ |
| 93 |
- PMOneOfDep, PMAllOfDep, PMBaseDep |
| 94 |
+ PMAnyOfDep, PMAllOfDep, PMBaseDep |
| 95 |
from gentoopm.pkgcorepm.atom import PkgCoreAtom |
| 96 |
|
| 97 |
class PkgCoreBaseDep(PMBaseDep): |
| 98 |
@@ -21,7 +21,7 @@ class PkgCoreBaseDep(PMBaseDep): |
| 99 |
if isinstance(d, atom): |
| 100 |
yield PkgCoreAtom(d) |
| 101 |
elif isinstance(d, OrRestriction): |
| 102 |
- yield PkgCoreOneOfDep(d, self._pkg) |
| 103 |
+ yield PkgCoreAnyOfDep(d, self._pkg) |
| 104 |
elif isinstance(d, AndRestriction): |
| 105 |
yield PkgCoreAllOfDep(d, self._pkg) |
| 106 |
elif isinstance(d, Conditional) and d.attr == 'use': |
| 107 |
@@ -30,7 +30,7 @@ class PkgCoreBaseDep(PMBaseDep): |
| 108 |
raise NotImplementedError('Parsing %s not implemented' \ |
| 109 |
% repr(d)) |
| 110 |
|
| 111 |
-class PkgCoreOneOfDep(PMOneOfDep, PkgCoreBaseDep): |
| 112 |
+class PkgCoreAnyOfDep(PMAnyOfDep, PkgCoreBaseDep): |
| 113 |
pass |
| 114 |
|
| 115 |
class PkgCoreAllOfDep(PMAllOfDep, PkgCoreBaseDep): |
| 116 |
@@ -60,14 +60,14 @@ class PkgCoreUncondDep(PkgCoreBaseDep): |
| 117 |
if isinstance(d, atom): |
| 118 |
yield PkgCoreAtom(d) |
| 119 |
elif isinstance(d, OrRestriction): |
| 120 |
- yield PkgCoreUncondOneOfDep(d) |
| 121 |
+ yield PkgCoreUncondAnyOfDep(d) |
| 122 |
elif isinstance(d, AndRestriction): |
| 123 |
yield PkgCoreUncondAllOfDep(d, self._pkg) |
| 124 |
else: |
| 125 |
raise NotImplementedError('Parsing %s not implemented' \ |
| 126 |
% repr(d)) |
| 127 |
|
| 128 |
-class PkgCoreUncondOneOfDep(PMOneOfDep, PkgCoreUncondDep): |
| 129 |
+class PkgCoreUncondAnyOfDep(PMAnyOfDep, PkgCoreUncondDep): |
| 130 |
pass |
| 131 |
|
| 132 |
class PkgCoreUncondAllOfDep(PMAllOfDep, PkgCoreUncondDep): |
| 133 |
|
| 134 |
diff --git a/gentoopm/portagepm/depend.py b/gentoopm/portagepm/depend.py |
| 135 |
index 15b7dcc..d4f3c33 100644 |
| 136 |
--- a/gentoopm/portagepm/depend.py |
| 137 |
+++ b/gentoopm/portagepm/depend.py |
| 138 |
@@ -6,7 +6,7 @@ |
| 139 |
from portage.dep import paren_reduce, use_reduce |
| 140 |
|
| 141 |
from gentoopm.basepm.depend import PMPackageDepSet, PMConditionalDep, \ |
| 142 |
- PMOneOfDep, PMAllOfDep, PMBaseDep |
| 143 |
+ PMAnyOfDep, PMAllOfDep, PMBaseDep |
| 144 |
from gentoopm.portagepm.atom import PortageAtom |
| 145 |
|
| 146 |
class PortageBaseDep(PMBaseDep): |
| 147 |
@@ -18,7 +18,7 @@ class PortageBaseDep(PMBaseDep): |
| 148 |
it = iter(self._deps) |
| 149 |
for d in it: |
| 150 |
if d == '||': |
| 151 |
- yield PortageOneOfDep(next(it), self._puse) |
| 152 |
+ yield PortageAnyOfDep(next(it), self._puse) |
| 153 |
elif d == '&&': |
| 154 |
yield PortageAllOfDep(next(it), self._puse) |
| 155 |
elif d.endswith('?'): |
| 156 |
@@ -27,7 +27,7 @@ class PortageBaseDep(PMBaseDep): |
| 157 |
else: |
| 158 |
yield PortageAtom(d) |
| 159 |
|
| 160 |
-class PortageOneOfDep(PMOneOfDep, PortageBaseDep): |
| 161 |
+class PortageAnyOfDep(PMAnyOfDep, PortageBaseDep): |
| 162 |
pass |
| 163 |
|
| 164 |
class PortageAllOfDep(PMAllOfDep, PortageBaseDep): |
| 165 |
@@ -69,13 +69,13 @@ class PortageUncondDep(PortageBaseDep): |
| 166 |
it = iter(self._deps) |
| 167 |
for d in it: |
| 168 |
if d == '||': |
| 169 |
- yield PortageUncondOneOfDep(next(it)) |
| 170 |
+ yield PortageUncondAnyOfDep(next(it)) |
| 171 |
elif d == '&&': |
| 172 |
yield PortageUncondAllOfDep(next(it)) |
| 173 |
else: |
| 174 |
yield PortageAtom(d) |
| 175 |
|
| 176 |
-class PortageUncondOneOfDep(PMOneOfDep, PortageUncondDep): |
| 177 |
+class PortageUncondAnyOfDep(PMAnyOfDep, PortageUncondDep): |
| 178 |
pass |
| 179 |
|
| 180 |
class PortageUncondAllOfDep(PMAllOfDep, PortageUncondDep): |
Archives