From 3d29e091cdf2d640d2680133dc360ed7f2abd7b1 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 10 Sep 2010 09:22:44 -0700 Subject: In depgraph._show_unsatisfied_dep(), if the child package is masked then a change to parent USE is not a valid solution (a normal mask message should be displayed instead). --- pym/_emerge/depgraph.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 13787b2f3..33fed5082 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2177,6 +2177,13 @@ class depgraph(object): if not missing_iuse and myparent and atom.unevaluated_atom.use.conditional: # Lets see if the violated use deps are conditional. # If so, suggest to change them on the parent. + + # If the child package is masked then a change to + # parent USE is not a valid solution (a normal mask + # message should be displayed instead). + if pkg in masked_pkg_instances: + continue + mreasons = [] violated_atom = atom.unevaluated_atom.violated_conditionals(self._pkg_use_enabled(pkg), \ pkg.iuse.is_valid_flag, self._pkg_use_enabled(myparent)) -- cgit v1.2.3-1-g7c22