summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Dolbec <dolsen@gentoo.org>2015-11-08 18:37:15 -0800
committerBrian Dolbec <dolsen@gentoo.org>2015-11-08 18:37:15 -0800
commitddb7cf01f01d7175cdab348b9d94b0994695e337 (patch)
treeb7ded8d3f3503b520c501bb30c58f72dd0f51dfd
parentequery/meta.py: Fix a traceback reported by Manuel Rueger (diff)
downloadgentoolkit-ddb7cf01f01d7175cdab348b9d94b0994695e337.tar.gz
gentoolkit-ddb7cf01f01d7175cdab348b9d94b0994695e337.tar.bz2
gentoolkit-ddb7cf01f01d7175cdab348b9d94b0994695e337.zip
equery/meta.py: Revert the changes to the verbose section or format_maintainers
The last change would always print the first string even if the maint attribute was None. This was due to the string always being non-empty. The original code there was correct. It was only the maint.email assignment that was in error.
-rw-r--r--pym/gentoolkit/equery/meta.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/pym/gentoolkit/equery/meta.py b/pym/gentoolkit/equery/meta.py
index 1a07999..8af5744 100644
--- a/pym/gentoolkit/equery/meta.py
+++ b/pym/gentoolkit/equery/meta.py
@@ -181,9 +181,9 @@ def format_maintainers(maints):
for maint in maints:
maintstr = maint.email or ''
if CONFIG['verbose']:
- maintstr += " (%s)" % (maint.name or'')
- maintstr += " - %s" % (maint.restrict or '')
- maintstr += "\n%s" % (maint.description or '')
+ 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 ''
result.append(maintstr)
return result