* [gentoo-portage-dev] [PATCH 1/2] emerge: add reference to the portage(5) man page when failing
@ 2013-01-15 20:36 Mike Frysinger
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:04 ` [gentoo-portage-dev] [PATCH 1/2] emerge: add reference to the portage(5) man page when failing Zac Medico
0 siblings, 2 replies; 4+ messages in thread
From: Mike Frysinger @ 2013-01-15 20:36 UTC (permalink / raw
To: gentoo-portage-dev
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-portage-dev] [PATCH 2/2] portage(5): add more pointers to make.conf
2013-01-15 20:36 [gentoo-portage-dev] [PATCH 1/2] emerge: add reference to the portage(5) man page when failing Mike Frysinger
@ 2013-01-15 20:36 ` 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
1 sibling, 1 reply; 4+ messages in thread
From: Mike Frysinger @ 2013-01-15 20:36 UTC (permalink / raw
To: gentoo-portage-dev
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
man/portage.5 | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/man/portage.5 b/man/portage.5
index 39ccfb2..4f67233 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -684,7 +684,8 @@ sys\-libs/glibc glibc.conf
.TP
.BR package.license
-This will allow ACCEPT_LICENSE to be augmented for a single package.
+This will allow ACCEPT_LICENSE (see \fBmake.conf\fR(5)) to be augmented for a
+single package.
.I Format:
.nf
@@ -712,7 +713,8 @@ versions earlier than 1.0.4496. No problem!
.fi
.TP
.BR package.properties
-This will allow ACCEPT_PROPERTIES to be augmented for a single package.
+This will allow ACCEPT_PROPERTIES (see \fBmake.conf\fR(5)) to be augmented for a
+single package.
.I Format:
.nf
--
1.8.0.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [gentoo-portage-dev] [PATCH 1/2] emerge: add reference to the portage(5) man page when failing
2013-01-15 20:36 [gentoo-portage-dev] [PATCH 1/2] emerge: add reference to the portage(5) man page when failing Mike Frysinger
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:04 ` Zac Medico
1 sibling, 0 replies; 4+ messages in thread
From: Zac Medico @ 2013-01-15 21:04 UTC (permalink / raw
To: gentoo-portage-dev
On 01/15/2013 12:36 PM, Mike Frysinger wrote:
> 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
Looks good to me.
--
Thanks,
Zac
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [gentoo-portage-dev] [PATCH 2/2] portage(5): add more pointers to make.conf
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
0 siblings, 0 replies; 4+ messages in thread
From: Zac Medico @ 2013-01-15 21:05 UTC (permalink / raw
To: gentoo-portage-dev
On 01/15/2013 12:36 PM, Mike Frysinger wrote:
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
> man/portage.5 | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
Looks good to me.
--
Thanks,
Zac
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-01-15 21:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-15 20:36 [gentoo-portage-dev] [PATCH 1/2] emerge: add reference to the portage(5) man page when failing Mike Frysinger
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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox