In depgraph._show_unsatisfied_dep(), if the child package is masked then a
authorZac Medico <zmedico@gentoo.org>
Fri, 10 Sep 2010 16:22:44 +0000 (09:22 -0700)
committerZac Medico <zmedico@gentoo.org>
Fri, 10 Sep 2010 16:22:44 +0000 (09:22 -0700)
change to parent USE is not a valid solution (a normal mask message should
be displayed instead).

pym/_emerge/depgraph.py

index 13787b2f37dc9166bb1702ab26dfb84b2d51cc3c..33fed5082434f70bbaf69608d6a2a03cbee998d0 100644 (file)
@@ -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))