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 682D51384B4 for ; Sun, 8 Nov 2015 17:37:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E523B21C005; Sun, 8 Nov 2015 17:37:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8057C21C005 for ; Sun, 8 Nov 2015 17:37:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5C1A433FAAE for ; Sun, 8 Nov 2015 17:37:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D82A022AC for ; Sun, 8 Nov 2015 17:37:48 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1447004187.8f226fd87cc96c997a6be5adb29ed6e6787d0791.dolsen@gentoo> Subject: [gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/equery/ X-VCS-Repository: proj/gentoolkit X-VCS-Files: pym/gentoolkit/equery/meta.py X-VCS-Directories: pym/gentoolkit/equery/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 8f226fd87cc96c997a6be5adb29ed6e6787d0791 X-VCS-Branch: master Date: Sun, 8 Nov 2015 17:37:48 +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: c6e0fcb4-38b8-446b-9d3a-d0e8ca0285df X-Archives-Hash: 682c97692f8432dc739a48325837f451 commit: 8f226fd87cc96c997a6be5adb29ed6e6787d0791 Author: Brian Dolbec gentoo org> AuthorDate: Sun Nov 8 17:15:03 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Sun Nov 8 17:36:27 2015 +0000 URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=8f226fd8 equery/meta.py: Fix a traceback reported by Manuel Rueger equery m python-whiteboard * x11-apps/python-whiteboard [gentoo] Herd: proxy-maintainers (proxy-maint gentoo.org) Maintainer: lxnay gentoo.org (Fabio Erculiani) Maintainer. Assign bugs to him Maintainer: ziapannocchia gmail.com (Marco Clocchiatti) Proxy maintainer. CC him on bugs Traceback (most recent call last): File "/usr/lib/python-exec/python2.7/equery", line 38, in equery.main(sys.argv) File "/usr/lib64/python2.7/site-packages/gentoolkit/equery/__init__.py", line 357, in main loaded_module.main(module_args) File "/usr/lib64/python2.7/site-packages/gentoolkit/equery/meta.py", line 567, in main call_format_functions(best_match, matches) File "/usr/lib64/python2.7/site-packages/gentoolkit/equery/meta.py", line 338, in call_format_functions upstream = format_upstream(best_match.metadata.upstream()) File "/usr/lib64/python2.7/site-packages/gentoolkit/equery/meta.py", line 220, in format_upstream upmaints = format_maintainers(up.maintainers) File "/usr/lib64/python2.7/site-packages/gentoolkit/equery/meta.py", line 185, in format_maintainers maintstr += " (%s)" % (maint.name,) if maint.name else '' TypeError: unsupported operand type(s) for +=: 'NoneType' and 'str' Signed-off-by: Brian Dolbec gentoo.org> pym/gentoolkit/equery/meta.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pym/gentoolkit/equery/meta.py b/pym/gentoolkit/equery/meta.py index d3342cd..1a07999 100644 --- a/pym/gentoolkit/equery/meta.py +++ b/pym/gentoolkit/equery/meta.py @@ -179,14 +179,11 @@ def format_maintainers(maints): result = [] for maint in maints: - maintstr = '' - maintstr = maint.email + maintstr = maint.email or '' if CONFIG['verbose']: - maintstr += " (%s)" % (maint.name,) if maint.name else '' - maintstr += " - %s" % (maint.restrict,) if maint.restrict else '' - maintstr += "\n%s" % ( - (maint.description,) if maint.description else '' - ) + maintstr += " (%s)" % (maint.name or'') + maintstr += " - %s" % (maint.restrict or '') + maintstr += "\n%s" % (maint.description or '') result.append(maintstr) return result