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

["André Erdmann" <dywi@mailerd.de>]

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

DescriptionReader: no exception on field redef

The DescriptionReader now prints a warning if a field ('Title',..)
is specified more than once in a DESCRIPTION file.
Old behavior was to raise an exception.

	modified:   roverlay/rpackage/descriptionreader.py

---
 roverlay/rpackage/descriptionreader.py |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/roverlay/rpackage/descriptionreader.py b/roverlay/rpackage/descriptionreader.py
index fca19e9..bfb50bb 100644
--- a/roverlay/rpackage/descriptionreader.py
+++ b/roverlay/rpackage/descriptionreader.py
@@ -293,7 +293,7 @@ class DescriptionReader ( object ):
 					pass
 
 			else:
-				# line introduces a new field context, forget last one
+				# line has to introduce a new field context, forget last one
 				field_context = None
 
 				line_components = sline.partition (
@@ -301,13 +301,13 @@ class DescriptionReader ( object ):
 				)
 
 				if line_components [1]:
-					# line contains a field separator, set field context
+					# line contains a field separator => new context, set it
 					field_context_ref = self.field_definition.get (
 						line_components [0]
 					)
 
 					if field_context_ref is None:
-						# useless line, skip
+						# field not defined, skip
 						self.logger.info (
 							"Skipped a description field: '%s'.", line_components [0]
 						)
@@ -328,12 +328,20 @@ class DescriptionReader ( object ):
 							)
 
 						if field_context in raw:
-							raise Exception ( "field %s exists!" % field_context )
+							# some packages have multiple Title fields
+							# warn about that 'cause it could lead to confusing
+							# ebuild/metadata output
+							self.logger.warning (
+								"field {} redefined!".format ( field_context )
+							)
+
+							raw [field_context].append ( sline )
 
-						# add values to read_data, no need to check
-						#  line_components [2] 'cause [1] was a true str
-						# create a new empty list for this field_context
-						raw[field_context] = [ line_components [2].lstrip() ]
+						else:
+							# add values to read_data, no need to check
+							#  line_components [2] 'cause [1] was a true str
+							# create a new empty list for this field_context
+							raw[field_context] = [ line_components [2].lstrip() ]
 
 				else:
 					# reaching this branch means that