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 977A9138A1F for ; Sat, 19 Apr 2014 18:27:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4EB22E0A5B; Sat, 19 Apr 2014 18:26:58 +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 D93E5E0A5B for ; Sat, 19 Apr 2014 18:26:57 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B6E7D33FF11 for ; Sat, 19 Apr 2014 18:26:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id D009F18167 for ; Sat, 19 Apr 2014 18:26:54 +0000 (UTC) From: "Tobias Heinlein" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tobias Heinlein" Message-ID: <1397931803.9a33ceffe2e0045bf75b1209a90e9a53530d4e0d.keytoaster@gentoo> Subject: [gentoo-commits] proj/gentoolkit:gentoolkit 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: keytoaster X-VCS-Committer-Name: Tobias Heinlein X-VCS-Revision: 9a33ceffe2e0045bf75b1209a90e9a53530d4e0d X-VCS-Branch: gentoolkit Date: Sat, 19 Apr 2014 18:26:54 +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: f89cec67-bad0-4866-bb6a-13cb87a858b7 X-Archives-Hash: 5324cfd84963aa2fc7180006cbc249a5 commit: 9a33ceffe2e0045bf75b1209a90e9a53530d4e0d Author: Tobias Heinlein gentoo org> AuthorDate: Sat Apr 19 16:39:03 2014 +0000 Commit: Tobias Heinlein gentoo org> CommitDate: Sat Apr 19 18:23:23 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=commit;h=9a33ceff equery: Don't always print the license field (bug #508114). --- pym/gentoolkit/equery/meta.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pym/gentoolkit/equery/meta.py b/pym/gentoolkit/equery/meta.py index e2d2124..d3342cd 100644 --- a/pym/gentoolkit/equery/meta.py +++ b/pym/gentoolkit/equery/meta.py @@ -373,12 +373,13 @@ def call_format_functions(best_match, matches): useflags = format_useflags(best_match.metadata.use()) print_sequence(format_list(useflags)) - _license = best_match.environment(["LICENSE"]) - if QUERY_OPTS["license"]: - _license = format_list(_license) - else: - _license = format_list(_license, "License: ", " " * 13) - print_sequence(_license) + if QUERY_OPTS["license"] or not got_opts: + _license = best_match.environment(["LICENSE"]) + if QUERY_OPTS["license"]: + _license = format_list(_license) + else: + _license = format_list(_license, "License: ", " " * 13) + print_sequence(_license) if QUERY_OPTS["stablereq"]: # Get {: [u'ia64', u'm68k', ...], ...}