Suggest --autounmask-keep-masks instead of --autounmask=n

Currently emerge suggests --autounmask=n if any configuration
change is proposed. With this patch it will print a suggestion
only for mask changes, as these are the changes people complain
most about. It will suggest --autounmask-keep-masks in this case.

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 52d4545550524d7aa342cc03b4299ad582b31489..e5cc2ecb73307527de6aaee074e4583813dd8a8a 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -6033,15 +6033,11 @@ class depgraph(object):
                                except PortageException:
                                        problems.append("!!! Failed to write '%s'\n" % file_to_write_to)
 
-               if not quiet and \
-                       (unstable_keyword_msg or \
-                       p_mask_change_msg or \
-                       use_changes_msg or \
-                       license_msg):
+               if not quiet and p_mask_change_msg:
                        msg = [
                                "",
-                               "NOTE: This --autounmask behavior can be disabled by setting",
-                               "      EMERGE_DEFAULT_OPTS=\"--autounmask=n\" in make.conf."
+                               "NOTE: The --autounmask-keep-masks option will prevent emerge",
+                               "      from creating mask changes."
                        ]
                        for line in msg:
                                if line: