public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Brian Dolbec" <dolsen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/equery/
Date: Mon,  9 Nov 2015 02:42:27 +0000 (UTC)	[thread overview]
Message-ID: <1447036635.ddb7cf01f01d7175cdab348b9d94b0994695e337.dolsen@gentoo> (raw)

commit:     ddb7cf01f01d7175cdab348b9d94b0994695e337
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  9 02:37:15 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> 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


             reply	other threads:[~2015-11-09  2:42 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-09  2:42 Brian Dolbec [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-03-07 18:49 [gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/equery/ Sam James
2024-03-07 18:49 Sam James
2023-09-19 19:13 Sam James
2023-08-05  5:38 Sam James
2023-07-18 22:30 Sam James
2023-07-18 22:26 Sam James
2022-07-28 15:29 Brian Dolbec
2022-07-28 15:29 Brian Dolbec
2022-07-10 18:41 Brian Dolbec
2022-07-10 18:01 Brian Dolbec
2022-07-10 16:23 Brian Dolbec
2022-07-10 16:23 Brian Dolbec
2022-07-10  1:24 Brian Dolbec
2022-07-09  5:17 Sam James
2018-05-01 12:32 Mike Pagano
2017-09-05 15:32 Mike Gilbert
2016-06-30 23:36 Paul Varner
2016-06-30 20:44 Paul Varner
2016-06-06 19:29 Brian Dolbec
2015-11-09 20:52 Brian Dolbec
2015-11-08 17:37 Brian Dolbec

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1447036635.ddb7cf01f01d7175cdab348b9d94b0994695e337.dolsen@gentoo \
    --to=dolsen@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox