[gentoo-commits] proj/R_overlay:master commit in: roverlay/depres/simpledeprule/, roverlay/depres/

[André Erdmann]

commit:     464b87572270d1ba7a792e6bb3abaa3e93bcf2c8
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jul 20 16:08:09 2012 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jul 20 16:08:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=464b8757

add DynamicSelfdepPool to dependency resolution

	geändert:   roverlay/depres/depresolver.py
	geändert:   roverlay/depres/deprule.py
	geändert:   roverlay/depres/simpledeprule/abstractrules.py
	neue Datei:   roverlay/depres/simpledeprule/dynpool.py

---
 roverlay/depres/depresolver.py                 |   56 +++++++++++++++++++++---
 roverlay/depres/deprule.py                     |    5 ++
 roverlay/depres/simpledeprule/abstractrules.py |    5 +-
 roverlay/depres/simpledeprule/dynpool.py       |   40 +++++++++++++++++
 4 files changed, 97 insertions(+), 9 deletions(-)

diff --git a/roverlay/depres/depresolver.py b/roverlay/depres/depresolver.py
index 06ba6fc..a399454 100644
--- a/roverlay/depres/depresolver.py
+++ b/roverlay/depres/depresolver.py
@@ -15,6 +15,7 @@ except ImportError:
 from roverlay        import config
 from roverlay.depres import communication, deptype, events
 import roverlay.depres.simpledeprule.reader
+import roverlay.depres.simpledeprule.dynpool
 
 
 # if false: do not use the "negative" result caching which stores
@@ -78,7 +79,9 @@ class DependencyResolver ( object ):
 		self._depqueue_done = dict ()
 
 		# list of rule pools that have been created from reading files
-		self.static_rule_pools = list ()
+		self.static_rule_pools  = list()
+		# list of rule pools that are recreatable (at runtime)
+		self.dynamic_rule_pools = list()
 
 		if SAFE_CHANNEL_IDS:
 			# this lock is used in register_channel
@@ -91,7 +94,8 @@ class DependencyResolver ( object ):
 		"""Sorts the rule pools of this resolver."""
 		for pool in self.static_rule_pools: pool.sort()
 		poolsort = lambda pool : ( pool.priority, pool.rule_weight )
-		self.static_rule_pools.sort ( key=poolsort )
+		self.static_rule_pools.sort  ( key=poolsort )
+		self.dynamic_rule_pools.sort ( key=poolsort )
 	# --- end of sort (...) ---
 
 	def _reset_unresolvable ( self ):
@@ -112,18 +116,46 @@ class DependencyResolver ( object ):
 		)
 	# --- end of get_reader (...) ---
 
+	def make_selfdep_pool ( self, rule_kw_function, reload_now=False ):
+		"""Creates an dynamic selfdep pool and adds it to this resolver.
+
+		arguments:
+		* rule_kw_function -- function that returns an rule creation keyword
+		                      generator (basically, it has to return a list
+		                      of dicts)
+		"""
+		pool = roverlay.depres.simpledeprule.dynpool.get ( rule_kw_function )
+		self.dynamic_rule_pools.append ( pool )
+		if reload_now:
+			pool.reload()
+			self._new_rulepools_added()
+	# --- end of make_selfdep_pool (...) ---
+
 	def add_rulepool ( self, rulepool, pool_type=None ):
 		"""Adds a (static) rule pool to this resolver.
 		Calls self.sort() afterwards.
 
 		arguments:
-		* rulepool --
+		* rulepool  -- rule pool type, 1 for dynamic, else static
 		* pool_type -- ignored.
 		"""
-		self.static_rule_pools.append ( rulepool )
+		if pool_type == 1:
+			self.dynamic_rule_pools.append ( rulepool )
+		else:
+			self.static_rule_pools.append ( rulepool )
 		self._new_rulepools_added()
 	# --- end of add_rulepool (...) ---
 
+	def reload_pools ( self ):
+		one = False
+		for pool in self.dynamic_rule_pools:
+			one = True
+			pool.reload()
+
+		if one:
+			self._new_rulepools_added()
+	# --- end of reload_pools (...) ---
+
 	def _report_event ( self, event, dep_env=None, pkg_env=None, msg=None ):
 		"""Reports an event to the log and listeners.
 
@@ -335,10 +367,22 @@ class DependencyResolver ( object ):
 			is_resolved = 1
 
 		else:
+			for rulepool in (
+				p for p in self.dynamic_rule_pools \
+					if p.accepts ( dep_env.deptype_mask, try_other=False )
+			):
+				result = rulepool.matches ( dep_env )
+				if result [0] > 0:
+					resolved    = result [1]
+					is_resolved = 2
+					break
+			# TRY_OTHER searching is disabled for dynamic rule pools,
+			# (a) no dyn pool uses it, (b) probably not useful
+
 			# search for a match in the rule pools that accept the dep type
 			for rulepool in (
 				p for p in self.static_rule_pools \
-					if p.deptype_mask & dep_env.deptype_mask
+					if p.accepts ( dep_env.deptype_mask, try_other=False )
 			):
 				result = rulepool.matches ( dep_env )
 				if result [0] > 0:
@@ -352,7 +396,7 @@ class DependencyResolver ( object ):
 				#  that (normally) don't accept the dep type
 				for rulepool in (
 					p for p in self.static_rule_pools \
-						if p.deptype_mask & ~dep_env.deptype_mask
+						if p.accepts ( ~dep_env.deptype_mask, try_other=True )
 				):
 					result = rulepool.matches ( dep_env )
 					if result [0] > 0:

diff --git a/roverlay/depres/deprule.py b/roverlay/depres/deprule.py
index 50b921a..8c63987 100644
--- a/roverlay/depres/deprule.py
+++ b/roverlay/depres/deprule.py
@@ -70,6 +70,11 @@ class DependencyRulePool ( object ):
 		return None
 	# --- end of sort (...) ---
 
+	def accepts ( self, deptype_mask, try_other=False ):
+		"""Returns True if this pool accepts the given deptype_mask."""
+		return bool ( self.deptype_mask & deptype_mask )
+	# --- end of accepts (...) ---
+
 	def add ( self, rule ):
 		"""Adds a DependencyRule to this rule pool.
 

diff --git a/roverlay/depres/simpledeprule/abstractrules.py b/roverlay/depres/simpledeprule/abstractrules.py
index 1f0ba28..e4aa7b2 100644
--- a/roverlay/depres/simpledeprule/abstractrules.py
+++ b/roverlay/depres/simpledeprule/abstractrules.py
@@ -151,9 +151,8 @@ class FuzzySimpleRule ( SimpleRule ):
 
 						elif 'version' in fuzzy:
 
-							ver_pkg = '-'.join ( (
-								self.resolving_package, fuzzy ['version']
-							) )
+							ver_pkg = \
+								self.resolving_package + '-' +  fuzzy ['version']
 
 							vmod = fuzzy ['version_modifier'] \
 									if 'version_modifier' in fuzzy \

diff --git a/roverlay/depres/simpledeprule/dynpool.py b/roverlay/depres/simpledeprule/dynpool.py
new file mode 100644
index 0000000..eea146d
--- /dev/null
+++ b/roverlay/depres/simpledeprule/dynpool.py
@@ -0,0 +1,40 @@
+from roverlay.depres import deptype
+from roverlay.depres.simpledeprule.pool import SimpleDependencyRulePool
+from roverlay.depres.simpledeprule.rules import SimpleFuzzyDependencyRule
+
+class DynamicSelfdepRulePool ( SimpleDependencyRulePool ):
+	"""A rule pool that gets its rules from a function."""
+
+	def __init__ ( self, rule_kw_function, rule_class, priority=120, **kwargs ):
+		super ( DynamicSelfdepRulePool, self ). __init__ (
+			name='dynamic selfdeps', priority=priority,
+			deptype_mask=deptype.internal,
+			**kwargs
+		)
+
+		self._rule_class       = rule_class
+		self._rule_kw_function = rule_kw_function
+	# --- end of __init__ (...) ---
+
+	def accepts ( self, deptype_mask, try_other=False ):
+		if try_other:
+			# never resolve external deps as selfdeps
+			return False
+		else:
+			return self.deptype_mask & deptype_mask
+	# --- end of accepts (...) ---
+
+	def reload ( self ):
+		self.rules = list (
+			self._rule_class ( is_selfdep=True, **kwargs ) \
+				for kwargs in self._rule_kw_function()
+		)
+	# --- end of reload (...) ---
+
+
+def get ( rule_kw_function ):
+	"""Returns a default DynamicSelfdepRulePool for rule_kw_function."""
+	return DynamicSelfdepRulePool (
+		rule_kw_function, SimpleFuzzyDependencyRule
+	)
+# --- end of get (...) ---