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 98F341384B4 for ; Mon, 9 Nov 2015 02:42:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 18EDFE07DA; Mon, 9 Nov 2015 02:42:37 +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 AB847E07DA for ; Mon, 9 Nov 2015 02:42:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A500C33FEB1 for ; Mon, 9 Nov 2015 02:42:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D10D1231C for ; Mon, 9 Nov 2015 02:42:27 +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: <1447036635.ddb7cf01f01d7175cdab348b9d94b0994695e337.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: ddb7cf01f01d7175cdab348b9d94b0994695e337 X-VCS-Branch: master Date: Mon, 9 Nov 2015 02:42:27 +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: ffb37a87-ae33-4812-b3a6-f19b166064d5 X-Archives-Hash: 240f4b89586ecbfcbea6a2d189911468 commit: ddb7cf01f01d7175cdab348b9d94b0994695e337 Author: Brian Dolbec gentoo org> AuthorDate: Mon Nov 9 02:37:15 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Mon Nov 9 02:37:15 2015 +0000 URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=ddb7cf01 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(-) 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