From 8f63eff2c75f8c64fa7ea56425a557d869a64f2f Mon Sep 17 00:00:00 2001 From: Ben Kohler Date: Tue, 8 Jan 2013 17:06:01 -0800 Subject: autounmask: show file names for suggested changes Also, advise the user to examine the proposed config changes carefully. X-Gentoo-Bug: 450960 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=450960 --- pym/_emerge/depgraph.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index f02ccb6e9..428d41438 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -6578,22 +6578,22 @@ class depgraph(object): if root in unstable_keyword_msg: writemsg("\nThe following " + colorize("BAD", "keyword changes") + \ - " are necessary to proceed:\n", noiselevel=-1) + " (package.accept_keywords) are necessary to proceed:\n", noiselevel=-1) writemsg(format_msg(unstable_keyword_msg[root]), noiselevel=-1) if root in p_mask_change_msg: writemsg("\nThe following " + colorize("BAD", "mask changes") + \ - " are necessary to proceed:\n", noiselevel=-1) + " (package.unmask) are necessary to proceed:\n", noiselevel=-1) writemsg(format_msg(p_mask_change_msg[root]), noiselevel=-1) if root in use_changes_msg: writemsg("\nThe following " + colorize("BAD", "USE changes") + \ - " are necessary to proceed:\n", noiselevel=-1) + " (package.use) are necessary to proceed:\n", noiselevel=-1) writemsg(format_msg(use_changes_msg[root]), noiselevel=-1) if root in license_msg: writemsg("\nThe following " + colorize("BAD", "license changes") + \ - " are necessary to proceed:\n", noiselevel=-1) + " (package.license) are necessary to proceed:\n", noiselevel=-1) writemsg(format_msg(license_msg[root]), noiselevel=-1) protect_obj = {} @@ -6680,7 +6680,9 @@ class depgraph(object): writemsg("\nAutounmask changes successfully written. Remember to run dispatch-conf.\n", \ noiselevel=-1) elif not pretend and not autounmask_write and roots: - writemsg("\nUse --autounmask-write to write changes to config files (honoring CONFIG_PROTECT).\n", \ + writemsg("\nUse --autounmask-write to write changes to config files (honoring CONFIG_PROTECT). " + \ + "Always examine the list of proposed changes before continuing with --autounmask-write, " + \ + "as these changes may not be safe. \n", \ noiselevel=-1) -- cgit v1.2.3-1-g7c22