| 1 |
commit: 7c711ba2f85f5a3b4b5479dde81bb6b70a227a49 |
| 2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 3 |
AuthorDate: Fri Jun 29 22:27:10 2012 +0000 |
| 4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 5 |
CommitDate: Fri Jun 29 22:27:10 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=7c711ba2 |
| 7 |
|
| 8 |
descriptionreader: join lines with '', not ' ' |
| 9 |
|
| 10 |
lines are now joined using an empty char, this fixes |
| 11 |
reading entries like << |
| 12 |
a (>= 1.0), b |
| 13 |
(> 1.5) |
| 14 |
>> |
| 15 |
fields whose values should be joined using ' ' have to |
| 16 |
declare this in the field definition file using the 'joinValues' flag. |
| 17 |
|
| 18 |
modified: roverlay/rpackage/descriptionreader.py |
| 19 |
|
| 20 |
--- |
| 21 |
roverlay/rpackage/descriptionreader.py | 20 +++++++++++--------- |
| 22 |
1 files changed, 11 insertions(+), 9 deletions(-) |
| 23 |
|
| 24 |
diff --git a/roverlay/rpackage/descriptionreader.py b/roverlay/rpackage/descriptionreader.py |
| 25 |
index 1f6bd3e..94f36a3 100644 |
| 26 |
--- a/roverlay/rpackage/descriptionreader.py |
| 27 |
+++ b/roverlay/rpackage/descriptionreader.py |
| 28 |
@@ -108,21 +108,23 @@ class DescriptionReader ( object ): |
| 29 |
make_slist = lambda l : tuple ( filter ( None, slist_split ( l, 0 ) ) ) |
| 30 |
|
| 31 |
for field in raw.keys(): |
| 32 |
- value_line = ' '.join ( filter ( None, raw [field] ) ) |
| 33 |
|
| 34 |
- # join > isList > wsList [... >= join (implicit)] |
| 35 |
+ # join (' ') > isList > wsList [... >= join ('', implicit)] |
| 36 |
|
| 37 |
if field in fields_join: |
| 38 |
- read [field] = value_line |
| 39 |
+ read [field] = ' '.join ( filter ( None, raw [field] ) ) |
| 40 |
|
| 41 |
- elif field in fields_isList: |
| 42 |
- read [field] = make_list ( value_line ) |
| 43 |
+ else: |
| 44 |
+ value_line = ''.join ( filter ( None, raw [field] ) ) |
| 45 |
|
| 46 |
- elif field in fields_wsList: |
| 47 |
- read [field] = make_slist ( value_line ) |
| 48 |
+ if field in fields_isList: |
| 49 |
+ read [field] = make_list ( value_line ) |
| 50 |
|
| 51 |
- else: |
| 52 |
- read [field] = value_line |
| 53 |
+ elif field in fields_wsList: |
| 54 |
+ read [field] = make_slist ( value_line ) |
| 55 |
+ |
| 56 |
+ else: |
| 57 |
+ read [field] = value_line |
| 58 |
|
| 59 |
|
| 60 |
return read |
Archives