[gentoo-commits] proj/gentoopm:master commit in: gentoopm/basepm/

[Michał Górny]

commit:     e21be5ccba638ae1588d181db23f0e8380a5836d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 26 07:12:30 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jul 26 07:12:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=e21be5cc

Support removing conditionals from depsets.

---
 gentoopm/basepm/depend.py |   49 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 48 insertions(+), 1 deletions(-)

diff --git a/gentoopm/basepm/depend.py b/gentoopm/basepm/depend.py
index 78e5c02..e504594 100644
--- a/gentoopm/basepm/depend.py
+++ b/gentoopm/basepm/depend.py
@@ -21,11 +21,46 @@ class PMBaseDep(ABCObject):
 		"""
 		pass
 
+	@abstractproperty
+	def without_conditionals(self):
+		"""
+		Return the depspec with all conditionals resolved.
+
+		@type: L{PMUncondDep}
+		"""
+		pass
+
+class PMUncondDep(PMBaseDep):
+	def __init__(self, parent):
+		self._parent = parent
+
+	@property
+	def without_conditionals(self):
+		return self
+
+	def _iter_deps(self, deps):
+		for d in deps:
+			if isinstance(d, PMConditionalDep):
+				if d.enabled:
+					for d in self._iter_deps(d):
+						yield d
+			elif isinstance(d, PMOneOfDep):
+				yield PMUncondOneOfDep(d)
+			else:
+				yield d
+
+	def __iter__(self):
+		return self._iter_deps(self._parent)
+
 class PMConditionalDep(PMBaseDep):
 	"""
 	A conditional dependency set (enabled by a condition of some kind).
 	"""
 
+	@property
+	def without_conditionals(self):
+		return PMUncondDep((self,))
+
 	@abstractproperty
 	def enabled(self):
 		"""
@@ -36,10 +71,22 @@ class PMConditionalDep(PMBaseDep):
 		pass
 
 class PMOneOfDep(PMBaseDep):
+	"""
+	A one-of dependency set (C{|| ( ... )}).
+	"""
+
+	@property
+	def without_conditionals(self):
+		return PMUncondOneOfDep(self)
+
+class PMUncondOneOfDep(PMOneOfDep, PMUncondDep):
 	pass
 
 class PMPackageDepSet(PMBaseDep):
 	"""
 	A base class representing a depset of a single package.
 	"""
-	pass
+
+	@property
+	def without_conditionals(self):
+		return PMUncondDep(self)