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 E3C2B1384BF for ; Tue, 15 Jan 2013 20:33:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6836121C03D; Tue, 15 Jan 2013 20:33:03 +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 C214C21C016 for ; Tue, 15 Jan 2013 20:33:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 9D51C33D74E for ; Tue, 15 Jan 2013 20:33:01 +0000 (UTC) From: Mike Frysinger To: gentoo-portage-dev@lists.gentoo.org Subject: [gentoo-portage-dev] [PATCH 1/2] emerge: add reference to the portage(5) man page when failing Date: Tue, 15 Jan 2013 15:36:18 -0500 Message-Id: <1358282179-16522-1-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 1.8.0.2 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org X-Archives-Salt: a10aee7a-6db7-4bd8-8b75-adc6a3bf3a8d X-Archives-Hash: 59409e9277fed28eee86e1aa02ac98cf 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 --- pym/_emerge/depgraph.py | 17 +++++++++-------- 1 file 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 = {} -- 1.8.0.2