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 A824E1381F3 for ; Thu, 25 Jul 2013 08:47:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D1C0E0A03; Thu, 25 Jul 2013 08:47:46 +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 96DADE0A03 for ; Thu, 25 Jul 2013 08:47:45 +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 A051733E9CB for ; Thu, 25 Jul 2013 08:47:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 1A300E5458 for ; Thu, 25 Jul 2013 08:47:43 +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: <1374741979.27d832cc8c15efc9d35dd6527cb16e6a52112792.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/rpackage/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/rpackage/descriptionfields.py X-VCS-Directories: roverlay/rpackage/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 27d832cc8c15efc9d35dd6527cb16e6a52112792 X-VCS-Branch: master Date: Thu, 25 Jul 2013 08:47:43 +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: fccc190a-ddbd-4b05-b728-cbec6e29997d X-Archives-Hash: 3b5941c70a2eb9768676f67935217073 commit: 27d832cc8c15efc9d35dd6527cb16e6a52112792 Author: André Erdmann mailerd de> AuthorDate: Thu Jul 25 08:46:19 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Thu Jul 25 08:46:19 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=27d832cc roverlay/rpackage/descriptionfields: fix get() --- roverlay/rpackage/descriptionfields.py | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/roverlay/rpackage/descriptionfields.py b/roverlay/rpackage/descriptionfields.py index 58b83c5..b31c280 100644 --- a/roverlay/rpackage/descriptionfields.py +++ b/roverlay/rpackage/descriptionfields.py @@ -170,11 +170,12 @@ class DescriptionField ( object ): # bad identifier return False - if 'withcase' in self.aliases: - if field_identifier in self.aliases ['withcase']: + elif 'withcase' in self.aliases and ( + field_identifier in self.aliases ['withcase'] + ): return True - if 'nocase' in self.aliases: + elif 'nocase' in self.aliases: field_id_lower = field_identifier.lower() if field_id_lower in self.aliases ['nocase']: return True @@ -272,7 +273,16 @@ class DescriptionFields ( object ): arguments: * field_name -- """ - return self.fields.get ( field_name, None ) + field = self.fields.get ( field_name, None ) + if field is None: + for field in self.fields.values(): + if field.matches_alias ( field_name ): + return field + else: + return None + else: + return field + # --- end of get (...) --- def find_field ( self, field_name ): @@ -282,14 +292,13 @@ class DescriptionFields ( object ): arguments: * field_name -- """ - field = self.get ( field_name ) if field is None: - for field in self.fields: + for field in self.fields.values(): if field.matches_alias ( field_name ): - return field.get_name () + return field.get_name() else: - return field.get_name () + return field.get_name() # --- end of find_field (...) ---