* [gentoo-commits] proj/R_overlay:master commit in: roverlay/rpackage/
@ 2012-06-29 22:48 99% André Erdmann
0 siblings, 0 replies; 1+ results
From: André Erdmann @ 2012-06-29 22:48 UTC (permalink / raw
To: gentoo-commits
commit: 7c711ba2f85f5a3b4b5479dde81bb6b70a227a49
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jun 29 22:27:10 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jun 29 22:27:10 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=7c711ba2
descriptionreader: join lines with '', not ' '
lines are now joined using an empty char, this fixes
reading entries like <<
a (>= 1.0), b
(> 1.5)
>>
fields whose values should be joined using ' ' have to
declare this in the field definition file using the 'joinValues' flag.
modified: roverlay/rpackage/descriptionreader.py
---
roverlay/rpackage/descriptionreader.py | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/roverlay/rpackage/descriptionreader.py b/roverlay/rpackage/descriptionreader.py
index 1f6bd3e..94f36a3 100644
--- a/roverlay/rpackage/descriptionreader.py
+++ b/roverlay/rpackage/descriptionreader.py
@@ -108,21 +108,23 @@ class DescriptionReader ( object ):
make_slist = lambda l : tuple ( filter ( None, slist_split ( l, 0 ) ) )
for field in raw.keys():
- value_line = ' '.join ( filter ( None, raw [field] ) )
- # join > isList > wsList [... >= join (implicit)]
+ # join (' ') > isList > wsList [... >= join ('', implicit)]
if field in fields_join:
- read [field] = value_line
+ read [field] = ' '.join ( filter ( None, raw [field] ) )
- elif field in fields_isList:
- read [field] = make_list ( value_line )
+ else:
+ value_line = ''.join ( filter ( None, raw [field] ) )
- elif field in fields_wsList:
- read [field] = make_slist ( value_line )
+ if field in fields_isList:
+ read [field] = make_list ( value_line )
- else:
- read [field] = value_line
+ elif field in fields_wsList:
+ read [field] = make_slist ( value_line )
+
+ else:
+ read [field] = value_line
return read
^ permalink raw reply related [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2012-06-29 22:48 99% [gentoo-commits] proj/R_overlay:master commit in: roverlay/rpackage/ André Erdmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox