From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Skjzp-0000Fv-Rw for garchives@archives.gentoo.org; Fri, 29 Jun 2012 22:49:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0F64E0773; Fri, 29 Jun 2012 22:48:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C0EFAE0782 for ; Fri, 29 Jun 2012 22:48:24 +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 149521B401F for ; Fri, 29 Jun 2012 22:48:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D8D89E543F for ; Fri, 29 Jun 2012 22:48:21 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1341008830.7c711ba2f85f5a3b4b5479dde81bb6b70a227a49.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: 7c711ba2f85f5a3b4b5479dde81bb6b70a227a49 X-VCS-Branch: master Date: Fri, 29 Jun 2012 22:48:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 299b159c-8ffa-4bf6-90bc-10dc09bf0791 X-Archives-Hash: cb87241505d06ef5b394d326d4638bc7 commit: 7c711ba2f85f5a3b4b5479dde81bb6b70a227a49 Author: Andr=C3=A9 Erdmann mailerd de> AuthorDate: Fri Jun 29 22:27:10 2012 +0000 Commit: Andr=C3=A9 Erdmann mailerd de> CommitDate: Fri Jun 29 22:27:10 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/R_overlay.git= ;a=3Dcommit;h=3D7c711ba2 descriptionreader: join lines with '', not ' ' lines are now joined using an empty char, this fixes reading entries like << a (>=3D 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/d= escriptionreader.py index 1f6bd3e..94f36a3 100644 --- a/roverlay/rpackage/descriptionreader.py +++ b/roverlay/rpackage/descriptionreader.py @@ -108,21 +108,23 @@ class DescriptionReader ( object ): make_slist =3D lambda l : tuple ( filter ( None, slist_split ( l, 0 ) = ) ) =20 for field in raw.keys(): - value_line =3D ' '.join ( filter ( None, raw [field] ) ) =20 - # join > isList > wsList [... >=3D join (implicit)] + # join (' ') > isList > wsList [... >=3D join ('', implicit)] =20 if field in fields_join: - read [field] =3D value_line + read [field] =3D ' '.join ( filter ( None, raw [field] ) ) =20 - elif field in fields_isList: - read [field] =3D make_list ( value_line ) + else: + value_line =3D ''.join ( filter ( None, raw [field] ) ) =20 - elif field in fields_wsList: - read [field] =3D make_slist ( value_line ) + if field in fields_isList: + read [field] =3D make_list ( value_line ) =20 - else: - read [field] =3D value_line + elif field in fields_wsList: + read [field] =3D make_slist ( value_line ) + + else: + read [field] =3D value_line =20 =20 return read