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 5363A1381F3 for ; Wed, 21 Aug 2013 13:52:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DDCC7E0CD1; Wed, 21 Aug 2013 13:51:59 +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 5D29AE0CD1 for ; Wed, 21 Aug 2013 13:51:59 +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 3875B33EB54 for ; Wed, 21 Aug 2013 13:51:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id CF76FE5465 for ; Wed, 21 Aug 2013 13:51:55 +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: <1377092960.8a8e58c408b01ace3e9accb409e7e00f5af2aad8.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: 8a8e58c408b01ace3e9accb409e7e00f5af2aad8 X-VCS-Branch: master Date: Wed, 21 Aug 2013 13:51:55 +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: edc08cdf-b406-4d81-8022-3a7854064940 X-Archives-Hash: 70e8a71e0c13e4867a723bc774305c97 commit: 8a8e58c408b01ace3e9accb409e7e00f5af2aad8 Author: André Erdmann mailerd de> AuthorDate: Wed Aug 21 13:49:20 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Wed Aug 21 13:49:20 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=8a8e58c4 rpackage/descriptionreader: join aliased fields (fix) * properly join aliased is*List fields (e.g. "Recommends","Suggests" -> "Suggests"). * set pkg_name in parse_file() --- roverlay/rpackage/descriptionreader.py | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/roverlay/rpackage/descriptionreader.py b/roverlay/rpackage/descriptionreader.py index d011e3f..f0189a1 100644 --- a/roverlay/rpackage/descriptionreader.py +++ b/roverlay/rpackage/descriptionreader.py @@ -8,6 +8,7 @@ __all__ = [ 'DescriptionReader', 'make_desc_packageinfo', ] +import os.path import string import re import sys @@ -107,7 +108,8 @@ class DescriptionReader ( object ): # --- end of __init__ (...) --- def parse_file ( self, filepath ): - desc_lines = self._get_desc_from_file ( filepath ) + pkg_name = os.path.basename ( filepath ).partition ( '_' )[0] + desc_lines = self._get_desc_from_file ( filepath, pkg_name=pkg_name ) if desc_lines is None: return None else: @@ -403,15 +405,8 @@ class DescriptionReader ( object ): else: field_context = field_context_ref.get_name() - - if not field_context: - raise Exception ( - 'Field name is not valid! This should\'ve ' - 'already been catched in DescriptionField...' - ) - - new_value = line_components [2].strip() - field_value = raw.get ( field_context, None ) + new_value = line_components [2].strip() + field_value = raw.get ( field_context, None ) if not new_value: # add nothing but create field if it does not exist @@ -424,13 +419,13 @@ class DescriptionReader ( object ): raw [field_context] = [ new_value ] elif field_value: - # some packages have multiple Title fields - # warn about that 'cause it could lead to confusing - # ebuild/metadata output - self.logger.warning ( - "field redefinition: {f!r}".format ( f=field_context ) - ) + # aliased field (e.g. "Recommends","Suggests"->"Suggests") + # or redefinition (not checked here) + if 'islist' in field_context_ref.flags: + field_value.append ( "," ) + elif 'iswhitespacelist' in field_context_ref.flags: + field_value.append ( " " ) field_value.append ( new_value ) else: