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 CA5A41384C4 for ; Tue, 15 Jan 2013 22:43:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D9E121C048; Tue, 15 Jan 2013 22:43:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BEF2021C048 for ; Tue, 15 Jan 2013 22:43:00 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D03C533DAF0 for ; Tue, 15 Jan 2013 22:42:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4E787E4073 for ; Tue, 15 Jan 2013 22:42:57 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1358281889.f906f1973a77e3e1bdb10de277c5404fda1d52e8.vapier@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: f906f1973a77e3e1bdb10de277c5404fda1d52e8 X-VCS-Branch: master Date: Tue, 15 Jan 2013 22:42:57 +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: b370b662-0ef0-4ae0-a03a-e3d6771fcee7 X-Archives-Hash: 3b67d0bfebc27e15fb3bfde587d98475 commit: f906f1973a77e3e1bdb10de277c5404fda1d52e8 Author: Mike Frysinger gentoo org> AuthorDate: Tue Jan 15 20:31:29 2013 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Tue Jan 15 20:31:29 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f906f197 emerge: add reference to the portage(5) man page when failing For example, the current licensing error message looks like: The following license changes (package.license) are necessary to proceed: #required by quake3-bin (argument) >=games-fps/quake3-bin-1.32c-r1 GPL-2 Q3AEULA If you don't know much about licensing issues, this error message doesn't help. Instead, give references to the man page so people can easily delve further. Now it looks like: The following license changes are necessary to proceed: (see package.license in the portage(5) man page for more details) #required by quake3-bin (argument) >=games-fps/quake3-bin-1.32c-r1 GPL-2 Q3AEULA Signed-off-by: Mike Frysinger gentoo.org> --- pym/_emerge/depgraph.py | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 96ba871..92e3b1c 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -6576,24 +6576,25 @@ class depgraph(object): if len(roots) > 1: writemsg("\nFor %s:\n" % abs_user_config, noiselevel=-1) + def _writemsg(reason, file): + writemsg(('\nThe following %s are necessary to proceed:\n' + ' (see "%s" in the portage(5) man page for more details)\n') + % (colorize('BAD', reason), file), noiselevel=-1) + if root in unstable_keyword_msg: - writemsg("\nThe following " + colorize("BAD", "keyword changes") + \ - " (package.accept_keywords) are necessary to proceed:\n", noiselevel=-1) + _writemsg('keyword changes', 'package.accept_keywords') writemsg(format_msg(unstable_keyword_msg[root]), noiselevel=-1) if root in p_mask_change_msg: - writemsg("\nThe following " + colorize("BAD", "mask changes") + \ - " (package.unmask) are necessary to proceed:\n", noiselevel=-1) + _writemsg('mask changes', 'package.unmask') writemsg(format_msg(p_mask_change_msg[root]), noiselevel=-1) if root in use_changes_msg: - writemsg("\nThe following " + colorize("BAD", "USE changes") + \ - " (package.use) are necessary to proceed:\n", noiselevel=-1) + _writemsg('USE changes', 'package.use') writemsg(format_msg(use_changes_msg[root]), noiselevel=-1) if root in license_msg: - writemsg("\nThe following " + colorize("BAD", "license changes") + \ - " (package.license) are necessary to proceed:\n", noiselevel=-1) + _writemsg('license changes', 'package.license') writemsg(format_msg(license_msg[root]), noiselevel=-1) protect_obj = {}