summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Luther <SebastianLuther@gmx.de>2011-09-19 13:05:23 +0200
committerZac Medico <zmedico@gentoo.org>2011-09-19 07:32:32 -0700
commitcfae195364f3cc9700f34eef031933ff701d029d (patch)
treecf38d66ca7d7955653cad2e657c5053d2c8c27ec
parentd36be695ea48025ba195deb82f51846aee2254ec (diff)
downloadportage-cfae195364f3cc9700f34eef031933ff701d029d.tar.gz
portage-cfae195364f3cc9700f34eef031933ff701d029d.tar.bz2
portage-cfae195364f3cc9700f34eef031933ff701d029d.zip
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.
-rw-r--r--pym/_emerge/depgraph.py10
1 files changed, 3 insertions, 7 deletions
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: