From: Mike Frysinger <vapier@gentoo.org>
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 [thread overview]
Message-ID: <1358282179-16522-1-git-send-email-vapier@gentoo.org> (raw)
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 <vapier@gentoo.org>
---
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
next reply other threads:[~2013-01-15 20:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-15 20:36 Mike Frysinger [this message]
2013-01-15 20:36 ` [gentoo-portage-dev] [PATCH 2/2] portage(5): add more pointers to make.conf Mike Frysinger
2013-01-15 21:05 ` Zac Medico
2013-01-15 21:04 ` [gentoo-portage-dev] [PATCH 1/2] emerge: add reference to the portage(5) man page when failing Zac Medico
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=1358282179-16522-1-git-send-email-vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=gentoo-portage-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