1 |
For example, the current licensing error message looks like: |
2 |
|
3 |
The following license changes (package.license) are necessary to proceed: |
4 |
#required by quake3-bin (argument) |
5 |
>=games-fps/quake3-bin-1.32c-r1 GPL-2 Q3AEULA |
6 |
|
7 |
If you don't know much about licensing issues, this error message |
8 |
doesn't help. Instead, give references to the man page so people |
9 |
can easily delve further. Now it looks like: |
10 |
|
11 |
The following license changes are necessary to proceed: |
12 |
(see package.license in the portage(5) man page for more details) |
13 |
#required by quake3-bin (argument) |
14 |
>=games-fps/quake3-bin-1.32c-r1 GPL-2 Q3AEULA |
15 |
|
16 |
Signed-off-by: Mike Frysinger <vapier@g.o> |
17 |
--- |
18 |
pym/_emerge/depgraph.py | 17 +++++++++-------- |
19 |
1 file changed, 9 insertions(+), 8 deletions(-) |
20 |
|
21 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
22 |
index 96ba871..92e3b1c 100644 |
23 |
--- a/pym/_emerge/depgraph.py |
24 |
+++ b/pym/_emerge/depgraph.py |
25 |
@@ -6576,24 +6576,25 @@ class depgraph(object): |
26 |
if len(roots) > 1: |
27 |
writemsg("\nFor %s:\n" % abs_user_config, noiselevel=-1) |
28 |
|
29 |
+ def _writemsg(reason, file): |
30 |
+ writemsg(('\nThe following %s are necessary to proceed:\n' |
31 |
+ ' (see "%s" in the portage(5) man page for more details)\n') |
32 |
+ % (colorize('BAD', reason), file), noiselevel=-1) |
33 |
+ |
34 |
if root in unstable_keyword_msg: |
35 |
- writemsg("\nThe following " + colorize("BAD", "keyword changes") + \ |
36 |
- " (package.accept_keywords) are necessary to proceed:\n", noiselevel=-1) |
37 |
+ _writemsg('keyword changes', 'package.accept_keywords') |
38 |
writemsg(format_msg(unstable_keyword_msg[root]), noiselevel=-1) |
39 |
|
40 |
if root in p_mask_change_msg: |
41 |
- writemsg("\nThe following " + colorize("BAD", "mask changes") + \ |
42 |
- " (package.unmask) are necessary to proceed:\n", noiselevel=-1) |
43 |
+ _writemsg('mask changes', 'package.unmask') |
44 |
writemsg(format_msg(p_mask_change_msg[root]), noiselevel=-1) |
45 |
|
46 |
if root in use_changes_msg: |
47 |
- writemsg("\nThe following " + colorize("BAD", "USE changes") + \ |
48 |
- " (package.use) are necessary to proceed:\n", noiselevel=-1) |
49 |
+ _writemsg('USE changes', 'package.use') |
50 |
writemsg(format_msg(use_changes_msg[root]), noiselevel=-1) |
51 |
|
52 |
if root in license_msg: |
53 |
- writemsg("\nThe following " + colorize("BAD", "license changes") + \ |
54 |
- " (package.license) are necessary to proceed:\n", noiselevel=-1) |
55 |
+ _writemsg('license changes', 'package.license') |
56 |
writemsg(format_msg(license_msg[root]), noiselevel=-1) |
57 |
|
58 |
protect_obj = {} |
59 |
-- |
60 |
1.8.0.2 |