| 1 |
commit: cfae195364f3cc9700f34eef031933ff701d029d |
| 2 |
Author: Sebastian Luther <SebastianLuther <AT> gmx <DOT> de> |
| 3 |
AuthorDate: Mon Sep 19 11:05:23 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 19 14:32:32 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=cfae1953 |
| 7 |
|
| 8 |
Suggest --autounmask-keep-masks instead of --autounmask=n |
| 9 |
|
| 10 |
Currently emerge suggests --autounmask=n if any configuration |
| 11 |
change is proposed. With this patch it will print a suggestion |
| 12 |
only for mask changes, as these are the changes people complain |
| 13 |
most about. It will suggest --autounmask-keep-masks in this case. |
| 14 |
|
| 15 |
--- |
| 16 |
pym/_emerge/depgraph.py | 10 +++------- |
| 17 |
1 files changed, 3 insertions(+), 7 deletions(-) |
| 18 |
|
| 19 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 20 |
index 52d4545..e5cc2ec 100644 |
| 21 |
--- a/pym/_emerge/depgraph.py |
| 22 |
+++ b/pym/_emerge/depgraph.py |
| 23 |
@@ -6033,15 +6033,11 @@ class depgraph(object): |
| 24 |
except PortageException: |
| 25 |
problems.append("!!! Failed to write '%s'\n" % file_to_write_to) |
| 26 |
|
| 27 |
- if not quiet and \ |
| 28 |
- (unstable_keyword_msg or \ |
| 29 |
- p_mask_change_msg or \ |
| 30 |
- use_changes_msg or \ |
| 31 |
- license_msg): |
| 32 |
+ if not quiet and p_mask_change_msg: |
| 33 |
msg = [ |
| 34 |
"", |
| 35 |
- "NOTE: This --autounmask behavior can be disabled by setting", |
| 36 |
- " EMERGE_DEFAULT_OPTS=\"--autounmask=n\" in make.conf." |
| 37 |
+ "NOTE: The --autounmask-keep-masks option will prevent emerge", |
| 38 |
+ " from creating mask changes." |
| 39 |
] |
| 40 |
for line in msg: |
| 41 |
if line: |
Archives