diff options
author | Zac Medico <zmedico@gentoo.org> | 2010-09-10 09:22:44 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2010-09-10 09:22:44 -0700 |
commit | 3d29e091cdf2d640d2680133dc360ed7f2abd7b1 (patch) | |
tree | 1116be0349979bbe959bb18a63b13d5ff28588dc | |
parent | 465e8facba7deffea50d76e8be03badc14927fb3 (diff) | |
download | portage-3d29e091cdf2d640d2680133dc360ed7f2abd7b1.tar.gz portage-3d29e091cdf2d640d2680133dc360ed7f2abd7b1.tar.bz2 portage-3d29e091cdf2d640d2680133dc360ed7f2abd7b1.zip |
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).
-rw-r--r-- | pym/_emerge/depgraph.py | 7 |
1 files changed, 7 insertions, 0 deletions
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)) |