| 1 |
commit: 392cc10c0a6f608ab7a8f4a8043b58589c6ee21c |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 19 15:53:55 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 19 15:53:55 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=392cc10c |
| 7 |
|
| 8 |
Suggest --autounmask-keep-masks for ** keyword. |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/depgraph.py | 7 +++++-- |
| 12 |
1 files changed, 5 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 15 |
index e5cc2ec..19773c2 100644 |
| 16 |
--- a/pym/_emerge/depgraph.py |
| 17 |
+++ b/pym/_emerge/depgraph.py |
| 18 |
@@ -5767,6 +5767,7 @@ class depgraph(object): |
| 19 |
#Set of roots we have autounmask changes for. |
| 20 |
roots = set() |
| 21 |
|
| 22 |
+ masked_by_missing_keywords = False |
| 23 |
unstable_keyword_msg = {} |
| 24 |
for pkg in self._dynamic_config._needed_unstable_keywords: |
| 25 |
self._show_merge_list() |
| 26 |
@@ -5782,6 +5783,8 @@ class depgraph(object): |
| 27 |
if reason.unmask_hint and \ |
| 28 |
reason.unmask_hint.key == 'unstable keyword': |
| 29 |
keyword = reason.unmask_hint.value |
| 30 |
+ if keyword == "**": |
| 31 |
+ masked_by_missing_keywords = True |
| 32 |
|
| 33 |
unstable_keyword_msg[root].append(self._get_dep_chain_as_comment(pkg)) |
| 34 |
if autounmask_unrestricted_atoms: |
| 35 |
@@ -6033,11 +6036,11 @@ class depgraph(object): |
| 36 |
except PortageException: |
| 37 |
problems.append("!!! Failed to write '%s'\n" % file_to_write_to) |
| 38 |
|
| 39 |
- if not quiet and p_mask_change_msg: |
| 40 |
+ if not quiet and (p_mask_change_msg or masked_by_missing_keywords): |
| 41 |
msg = [ |
| 42 |
"", |
| 43 |
"NOTE: The --autounmask-keep-masks option will prevent emerge", |
| 44 |
- " from creating mask changes." |
| 45 |
+ " from creating package.unmask or ** keyword changes." |
| 46 |
] |
| 47 |
for line in msg: |
| 48 |
if line: |
Archives