diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-09-19 08:53:55 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-09-19 08:53:55 -0700 |
| commit | 392cc10c0a6f608ab7a8f4a8043b58589c6ee21c (patch) | |
| tree | b66e50feafd0105548e8e5dd4092169ad76a0e0e | |
| parent | Suggest --autounmask-keep-masks instead of --autounmask=n (diff) | |
| download | portage-392cc10c0a6f608ab7a8f4a8043b58589c6ee21c.tar.gz portage-392cc10c0a6f608ab7a8f4a8043b58589c6ee21c.tar.bz2 portage-392cc10c0a6f608ab7a8f4a8043b58589c6ee21c.zip | |
Suggest --autounmask-keep-masks for ** keyword.
| -rw-r--r-- | pym/_emerge/depgraph.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index e5cc2ecb7..19773c2d9 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -5767,6 +5767,7 @@ class depgraph(object): #Set of roots we have autounmask changes for. roots = set() + masked_by_missing_keywords = False unstable_keyword_msg = {} for pkg in self._dynamic_config._needed_unstable_keywords: self._show_merge_list() @@ -5782,6 +5783,8 @@ class depgraph(object): if reason.unmask_hint and \ reason.unmask_hint.key == 'unstable keyword': keyword = reason.unmask_hint.value + if keyword == "**": + masked_by_missing_keywords = True unstable_keyword_msg[root].append(self._get_dep_chain_as_comment(pkg)) if autounmask_unrestricted_atoms: @@ -6033,11 +6036,11 @@ class depgraph(object): except PortageException: problems.append("!!! Failed to write '%s'\n" % file_to_write_to) - if not quiet and p_mask_change_msg: + if not quiet and (p_mask_change_msg or masked_by_missing_keywords): msg = [ "", "NOTE: The --autounmask-keep-masks option will prevent emerge", - " from creating mask changes." + " from creating package.unmask or ** keyword changes." ] for line in msg: if line: |