| 1 |
commit: 2d08e6c4520556e5acc0055cdb3d68028eed3243 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 11 03:18:57 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 11 03:18:57 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2d08e6c4 |
| 7 |
|
| 8 |
display_autounmask: highlight config changes |
| 9 |
|
| 10 |
As suggested here: |
| 11 |
|
| 12 |
http://archives.gentoo.org/gentoo-dev/msg_06a47ad55977f4d16bfe18769c6c38b8.xml |
| 13 |
|
| 14 |
--- |
| 15 |
pym/_emerge/depgraph.py | 16 ++++++++++++---- |
| 16 |
1 files changed, 12 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 19 |
index 6d0ba1c..cdc5098 100644 |
| 20 |
--- a/pym/_emerge/depgraph.py |
| 21 |
+++ b/pym/_emerge/depgraph.py |
| 22 |
@@ -6054,6 +6054,14 @@ class depgraph(object): |
| 23 |
|
| 24 |
write_to_file = not problems |
| 25 |
|
| 26 |
+ def format_msg(lines): |
| 27 |
+ lines = lines[:] |
| 28 |
+ for i, line in enumerate(lines): |
| 29 |
+ if line.startswith("#"): |
| 30 |
+ continue |
| 31 |
+ lines[i] = colorize("INFORM", line.rstrip()) + "\n" |
| 32 |
+ return "".join(lines) |
| 33 |
+ |
| 34 |
for root in roots: |
| 35 |
settings = self._frozen_config.roots[root].settings |
| 36 |
abs_user_config = os.path.join( |
| 37 |
@@ -6065,22 +6073,22 @@ class depgraph(object): |
| 38 |
if root in unstable_keyword_msg: |
| 39 |
writemsg_stdout("\nThe following " + colorize("BAD", "keyword changes") + \ |
| 40 |
" are necessary to proceed:\n", noiselevel=-1) |
| 41 |
- writemsg_stdout("".join(unstable_keyword_msg[root]), noiselevel=-1) |
| 42 |
+ writemsg_stdout(format_msg(unstable_keyword_msg[root]), noiselevel=-1) |
| 43 |
|
| 44 |
if root in p_mask_change_msg: |
| 45 |
writemsg_stdout("\nThe following " + colorize("BAD", "mask changes") + \ |
| 46 |
" are necessary to proceed:\n", noiselevel=-1) |
| 47 |
- writemsg_stdout("".join(p_mask_change_msg[root]), noiselevel=-1) |
| 48 |
+ writemsg_stdout(format_msg(p_mask_change_msg[root]), noiselevel=-1) |
| 49 |
|
| 50 |
if root in use_changes_msg: |
| 51 |
writemsg_stdout("\nThe following " + colorize("BAD", "USE changes") + \ |
| 52 |
" are necessary to proceed:\n", noiselevel=-1) |
| 53 |
- writemsg_stdout("".join(use_changes_msg[root]), noiselevel=-1) |
| 54 |
+ writemsg_stdout(format_msg(use_changes_msg[root]), noiselevel=-1) |
| 55 |
|
| 56 |
if root in license_msg: |
| 57 |
writemsg_stdout("\nThe following " + colorize("BAD", "license changes") + \ |
| 58 |
" are necessary to proceed:\n", noiselevel=-1) |
| 59 |
- writemsg_stdout("".join(license_msg[root]), noiselevel=-1) |
| 60 |
+ writemsg_stdout(format_msg(license_msg[root]), noiselevel=-1) |
| 61 |
|
| 62 |
protect_obj = {} |
| 63 |
if write_to_file: |
Archives