| 1 |
commit: 3d286b63c8287bcfff56b58efe097e521d8a5382 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 28 14:09:13 2011 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 28 14:09:13 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=3d286b63 |
| 7 |
|
| 8 |
Make PackageDepSet a subclass of AllOfDep. |
| 9 |
|
| 10 |
--- |
| 11 |
gentoopm/basepm/depend.py | 5 +++-- |
| 12 |
gentoopm/paludispm/depend.py | 2 +- |
| 13 |
gentoopm/pkgcorepm/depend.py | 7 ++----- |
| 14 |
gentoopm/portagepm/depend.py | 5 +---- |
| 15 |
4 files changed, 7 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/gentoopm/basepm/depend.py b/gentoopm/basepm/depend.py |
| 18 |
index 262a010..72ebb49 100644 |
| 19 |
--- a/gentoopm/basepm/depend.py |
| 20 |
+++ b/gentoopm/basepm/depend.py |
| 21 |
@@ -100,9 +100,10 @@ class PMOneOfDep(PMBaseDep): |
| 22 |
class PMUncondOneOfDep(PMOneOfDep, PMUncondBaseDep): |
| 23 |
pass |
| 24 |
|
| 25 |
-class PMPackageDepSet(PMBaseDep): |
| 26 |
+class PMPackageDepSet(PMAllOfDep): |
| 27 |
""" |
| 28 |
- A base class representing a depset of a single package. |
| 29 |
+ A base class representing a depset (or depset-like variable) of a single |
| 30 |
+ package. |
| 31 |
""" |
| 32 |
|
| 33 |
@property |
| 34 |
|
| 35 |
diff --git a/gentoopm/paludispm/depend.py b/gentoopm/paludispm/depend.py |
| 36 |
index ab23d27..d5e0069 100644 |
| 37 |
--- a/gentoopm/paludispm/depend.py |
| 38 |
+++ b/gentoopm/paludispm/depend.py |
| 39 |
@@ -38,5 +38,5 @@ class PaludisConditionalDep(PMConditionalDep, PaludisBaseDep): |
| 40 |
def enabled(self): |
| 41 |
return self._deps.condition_met(self._pkg._env, self._pkg._pkg) |
| 42 |
|
| 43 |
-class PaludisPackageDepSet(PMPackageDepSet, PaludisBaseDep): |
| 44 |
+class PaludisPackageDepSet(PMPackageDepSet, PaludisAllOfDep): |
| 45 |
pass |
| 46 |
|
| 47 |
diff --git a/gentoopm/pkgcorepm/depend.py b/gentoopm/pkgcorepm/depend.py |
| 48 |
index 78689b3..ed69f64 100644 |
| 49 |
--- a/gentoopm/pkgcorepm/depend.py |
| 50 |
+++ b/gentoopm/pkgcorepm/depend.py |
| 51 |
@@ -41,10 +41,10 @@ class PkgCoreConditionalUseDep(PMConditionalDep, PkgCoreBaseDep): |
| 52 |
def enabled(self): |
| 53 |
return self._deps.restriction.match(self._pkg.use) |
| 54 |
|
| 55 |
-class PkgCorePackageDepSet(PMPackageDepSet, PkgCoreBaseDep): |
| 56 |
+class PkgCorePackageDepSet(PMPackageDepSet, PkgCoreAllOfDep): |
| 57 |
@property |
| 58 |
def without_conditionals(self): |
| 59 |
- return PkgCoreUncondPackageDepSet( |
| 60 |
+ return PkgCoreUncondAllOfDep( |
| 61 |
self._deps.evaluate_depset(self._pkg.use)) |
| 62 |
|
| 63 |
class PkgCoreUncondDep(PkgCoreBaseDep): |
| 64 |
@@ -72,6 +72,3 @@ class PkgCoreUncondOneOfDep(PMOneOfDep, PkgCoreUncondDep): |
| 65 |
|
| 66 |
class PkgCoreUncondAllOfDep(PMAllOfDep, PkgCoreUncondDep): |
| 67 |
pass |
| 68 |
- |
| 69 |
-class PkgCoreUncondPackageDepSet(PkgCoreUncondDep): |
| 70 |
- pass |
| 71 |
|
| 72 |
diff --git a/gentoopm/portagepm/depend.py b/gentoopm/portagepm/depend.py |
| 73 |
index dd96664..15b7dcc 100644 |
| 74 |
--- a/gentoopm/portagepm/depend.py |
| 75 |
+++ b/gentoopm/portagepm/depend.py |
| 76 |
@@ -54,7 +54,7 @@ class PortagePackageDepSet(PMPackageDepSet, PortageBaseDep): |
| 77 |
|
| 78 |
@property |
| 79 |
def without_conditionals(self): |
| 80 |
- return PortageUncondPackageDepSet( |
| 81 |
+ return PortageUncondAllOfDep( |
| 82 |
use_reduce(self._depstr, self._puse)) |
| 83 |
|
| 84 |
class PortageUncondDep(PortageBaseDep): |
| 85 |
@@ -80,6 +80,3 @@ class PortageUncondOneOfDep(PMOneOfDep, PortageUncondDep): |
| 86 |
|
| 87 |
class PortageUncondAllOfDep(PMAllOfDep, PortageUncondDep): |
| 88 |
pass |
| 89 |
- |
| 90 |
-class PortageUncondPackageDepSet(PortageUncondDep): |
| 91 |
- pass |
Archives