From ddb7cf01f01d7175cdab348b9d94b0994695e337 Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Sun, 8 Nov 2015 18:37:15 -0800 Subject: 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. --- pym/gentoolkit/equery/meta.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pym') 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 -- cgit v1.2.3