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

[André Erdmann]

commit:     169dbd47cc0795101f25304e709f7f0045d7f364
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Jul  2 16:45:40 2012 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Jul  2 16:45:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=169dbd47

fix export_rule for simple dep rules

	modified:   roverlay/depres/abstractsimpledeprule.py
	modified:   roverlay/depres/simpledeprule.py

---
 roverlay/depres/abstractsimpledeprule.py |   60 +++++++++++++----------------
 roverlay/depres/simpledeprule.py         |   26 ++++++-------
 2 files changed, 39 insertions(+), 47 deletions(-)

diff --git a/roverlay/depres/abstractsimpledeprule.py b/roverlay/depres/abstractsimpledeprule.py
index b03ce63..811f88e 100644
--- a/roverlay/depres/abstractsimpledeprule.py
+++ b/roverlay/depres/abstractsimpledeprule.py
@@ -1,5 +1,6 @@
 import logging
 
+from roverlay import config
 from roverlay.depres import deprule
 
 TMP_LOGGER = logging.getLogger ('simpledeps')
@@ -29,8 +30,6 @@ class SimpleRule ( deprule.DependencyRule ):
 		if not dep_str is None:
 			self.dep_alias.append ( dep_str )
 
-		self.logger.debug ( "new rule (%s) for %s" % ( self.__class__.__name__, self.resolving_package ) )
-
 	# --- end of __init__ (...) ---
 
 	def done_reading ( self ):
@@ -80,45 +79,40 @@ class SimpleRule ( deprule.DependencyRule ):
 		return None
 	# --- end of matches (...) ---
 
-	def export_rule ( self, resolving_to=None ):
-		"""Returns this rule as a list of text lines that can be written into
-		a file.
-		An empty list will be returned if dep_alias has zero length.
-
-		arguments:
-		* resolving_to -- portage package that the exported rule should
-		                  resolve to, defaults to self.resolving_package or
-		                  an ignore keyword such as '!'.
+	def export_rule ( self ):
+		"""Generates text lines for this rule that can later be read using
+		the SimpleDependencyRuleReader.
 		"""
+		# todo hardcoded rule format here
+		if self.resolving_package is None:
+			resolving = ''
+		else:
+			resolving = self.resolving_package
 
-		alias_count = len ( self.dep_alias )
+			cat = config.get ( 'OVERLAY.category', None )
 
-		retlist = []
+			if cat is not None:
+				resolving = resolving.replace ( cat + '/', '')
 
-		if alias_count:
-			if resolving_to is None:
-				if hasattr ( self, 'resolving_package'):
-					resolving_package = self.resolving_package
-				else:
-					resolving_package = '!'
-			else:
-				resolving_package = resolving_to
+		if hasattr ( self.__class__, 'RULE_PREFIX' ):
+			resolving = self.__class__.RULE_PREFIX + resolving
 
-			# todo hardcoded rule format here
-			if alias_count > 1:
+		if len ( self.dep_alias ) == 0:
+			pass
 
-				retlist = [ resolving_package + ' {\n' ] + \
-					[ "\t%s\n" % alias for alias in self.dep_alias ] + \
-					[ '}\n' ]
-			else:
-				retlist = [
-					"%s :: %s\n" % ( resolving_package, self.dep_alias [0] )
-				]
+		elif len ( self.dep_alias ) == 1:
+			yield "%s :: %s\n" % ( resolving, iter ( self.dep_alias ).next() )
+
+		else:
+			yield resolving + ' {'
+			for alias in self.dep_alias:
+				yield "\t" + alias
+			yield '}'
+
+	def __str__ ( self ):
+		return '\n'.join ( self.export_rule() )
 
-		# -- if
 
-		return retlist
-	# --- end of export_rule (...) ---
 
 class FuzzySimpleRule ( SimpleRule ):
 

diff --git a/roverlay/depres/simpledeprule.py b/roverlay/depres/simpledeprule.py
index ce4ba10..04a47a6 100644
--- a/roverlay/depres/simpledeprule.py
+++ b/roverlay/depres/simpledeprule.py
@@ -13,6 +13,8 @@ TMP_LOGGER = logging.getLogger ('simpledeps')
 
 class SimpleIgnoreDependencyRule ( SimpleRule ):
 
+	RULE_PREFIX = '!'
+
 	def __init__ ( self, dep_str=None, priority=50, resolving_package=None ):
 		super ( SimpleIgnoreDependencyRule, self ) . __init__ (
 			dep_str=dep_str,
@@ -43,6 +45,8 @@ class SimpleDependencyRule ( SimpleRule ):
 
 class SimpleFuzzyIgnoreDependencyRule ( FuzzySimpleRule ):
 
+	RULE_PREFIX = '%'
+
 	def __init__ ( self, dep_str=None, priority=51, resolving_package=None ):
 		super ( SimpleFuzzyIgnoreDependencyRule, self ) . __init__ (
 			dep_str=dep_str,
@@ -52,6 +56,9 @@ class SimpleFuzzyIgnoreDependencyRule ( FuzzySimpleRule ):
 		)
 
 class SimpleFuzzyDependencyRule ( FuzzySimpleRule ):
+
+	RULE_PREFIX = '~'
+
 	def __init__ ( self, resolving_package, dep_str=None, priority=71 ):
 		super ( SimpleFuzzyDependencyRule, self ) . __init__ (
 			dep_str=dep_str,
@@ -117,11 +124,8 @@ class SimpleDependencyRulePool ( deprule.DependencyRulePool ):
 		raises: IOError (fh)
 		"""
 		for rule in self.rules:
-			to_write = fh.export_rule()
-			if isinstance ( to_write, str ):
-				fh.write ( to_write )
-			else:
-				fh.writelines ( to_write )
+			fh.write ( str ( rule ) )
+			fh.write ( '\n' )
 
 	# --- end of export_rules (...) ---
 
@@ -134,9 +138,9 @@ class SimpleDependencyRuleReader ( object ):
 	comment_chars      = "#;"
 
 	# todo: const/config?
-	package_ignore = '!'
-	fuzzy          = '~'
-	fuzzy_ignore   = '%'
+	package_ignore = SimpleIgnoreDependencyRule.RULE_PREFIX
+	fuzzy          = SimpleFuzzyDependencyRule.RULE_PREFIX
+	fuzzy_ignore   = SimpleFuzzyIgnoreDependencyRule.RULE_PREFIX
 
 	BREAK_PARSING  = frozenset (( '#! NOPARSE', '#! BREAK' ))
 
@@ -146,12 +150,6 @@ class SimpleDependencyRuleReader ( object ):
 		pass
 	# --- end of __init__  (...) ---
 
-
-	def _make_rule ( self, rule_str ):
-		CLS = self.__class__
-
-
-
 	def read_file ( self, filepath ):
 		"""Reads a file that contains simple dependency rules
 		(SimpleIgnoreDependencyRules/SimpleDependencyRules).