commit: 8f226fd87cc96c997a6be5adb29ed6e6787d0791
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 8 17:15:03 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> 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 <AT> gentoo.org)
Maintainer: lxnay <AT> gentoo.org (Fabio Erculiani)
Maintainer. Assign bugs to him
Maintainer: ziapannocchia <AT> 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 <module>
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 <dolsen <AT> 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
