From cfae195364f3cc9700f34eef031933ff701d029d Mon Sep 17 00:00:00 2001 From: Sebastian Luther Date: Mon, 19 Sep 2011 13:05:23 +0200 Subject: 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. --- pym/_emerge/depgraph.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'pym/_emerge/depgraph.py') diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 52d454555..e5cc2ecb7 100644 --- 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: -- cgit v1.2.3-1-g7c22