From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 269AE138200 for ; Thu, 25 Jul 2013 13:25:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A624DE09EF; Thu, 25 Jul 2013 13:25:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 232E1E09EA for ; Thu, 25 Jul 2013 13:25:56 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 34AA033E9FA for ; Thu, 25 Jul 2013 13:25:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BBEF3E5461 for ; Thu, 25 Jul 2013 13:25:53 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1374758499.455dacba38d8c8ef5c462f0fe2a1a45c1078bcb1.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/rpackage/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/rpackage/descriptionreader.py X-VCS-Directories: roverlay/rpackage/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 455dacba38d8c8ef5c462f0fe2a1a45c1078bcb1 X-VCS-Branch: master Date: Thu, 25 Jul 2013 13:25:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3667e5f9-088f-413e-8059-f6f9612eba54 X-Archives-Hash: bfd1a0d93fffdf2f650b3d95a1cebdf8 commit: 455dacba38d8c8ef5c462f0fe2a1a45c1078bcb1 Author: André Erdmann mailerd de> AuthorDate: Thu Jul 25 13:21:39 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Thu Jul 25 13:21:39 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=455dacba descriptionreader: join list items This allows to combine the "joinValues" with "isList", ... --- roverlay/rpackage/descriptionreader.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/roverlay/rpackage/descriptionreader.py b/roverlay/rpackage/descriptionreader.py index b589489..824c345 100644 --- a/roverlay/rpackage/descriptionreader.py +++ b/roverlay/rpackage/descriptionreader.py @@ -145,8 +145,8 @@ class DescriptionReader ( object ): for field_name, field_value in raw.items(): - # $hardcoded > join (' ') > isList - # > wsList [... >= join ('', implicit)] + # final value: $hardcoded > join (' ', value_line) > value_line + # and for value_line: isList > wsList [... >= join ('', implicit)] if field_name in fields_license: license_str = license_map.lookup ( ' '.join ( field_value ) ) @@ -154,7 +154,16 @@ class DescriptionReader ( object ): read [field_name] = license_str elif field_name in fields_join: - read [field_name] = ' '.join ( filter ( None, field_value ) ) + if field_name in fields_isList: + read [field_name] = ' '.join ( + ' '.join ( make_list ( l ) for l in field_value if l ) + ) + elif field_name in fields_wsList: + read [field_name] = ' '.join ( + ' '.join ( make_slist ( l ) for l in field_value if l ) + ) + else: + read [field_name] = ' '.join ( filter ( None, field_value ) ) else: value_line = ''.join ( filter ( None, field_value ) )