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

[André Erdmann]

commit:     991537a979fb2c3929e8447ec5a5aa9719322629
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jul  6 22:06:25 2012 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jul  6 22:06:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=991537a9

metadata: remove invalid chars "&<>" from values

	modified:   roverlay/metadata/abstractnodes.py

---
 roverlay/metadata/abstractnodes.py |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/roverlay/metadata/abstractnodes.py b/roverlay/metadata/abstractnodes.py
index f5a5c31..9e792e6 100644
--- a/roverlay/metadata/abstractnodes.py
+++ b/roverlay/metadata/abstractnodes.py
@@ -2,11 +2,12 @@
 # Copyright 2006-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+import re
 import textwrap
 
 INDENT = '\t'
 
-get_indent = lambda k : k * INDENT
+def get_indent ( k ): return k * INDENT
 
 # -- "abstract" metadata nodes --
 class _MetadataBasicNode ( object ):
@@ -14,6 +15,10 @@ class _MetadataBasicNode ( object ):
 	This is the most basic metadata node that should never be used directly.
 	"""
 
+	# these chars lead to metadata.bad: invalid token
+	# TODO/FIXME: look into repoman's / portage's source to get _all_ chars
+	INVALID_CHARS = "&<>"
+
 	def __init__ ( self, name, flags ):
 		"""Initializes a _MetadataBasicNode.
 
@@ -210,7 +215,13 @@ class MetadataLeaf ( _MetadataBasicNode ):
 				width=self.linewidth if hasattr ( self, 'linewidth' ) else 50
 			)
 
-		val_lines = self._text_wrapper.wrap ( self.value )
+		val_lines = self._text_wrapper.wrap (
+			re.sub (
+				"[{}]".format ( self.__class__.INVALID_CHARS ),
+				'',
+				self.value
+			)
+		)
 		if len ( val_lines ) < 1:
 			# why?
 			return ""