diff options
author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-08-14 08:43:34 +0200 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2010-08-13 23:51:35 -0700 |
commit | 1e69471d3eac6d0e2a01878ed3f0031783f57671 (patch) | |
tree | 2bdca931d8285942adfd5f7d1cb6022387004ba7 /pym/_emerge/depgraph.py | |
parent | 8389b036914d3be02da85ee2d4d8166e729c347f (diff) | |
download | portage-1e69471d3eac6d0e2a01878ed3f0031783f57671.tar.gz portage-1e69471d3eac6d0e2a01878ed3f0031783f57671.tar.bz2 portage-1e69471d3eac6d0e2a01878ed3f0031783f57671.zip |
Atom.violated_conditionals: Use iuse.is_valid_flag instead of iuse.all
Diffstat (limited to 'pym/_emerge/depgraph.py')
-rw-r--r-- | pym/_emerge/depgraph.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index e3a47e8a7..643cc3edf 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2078,7 +2078,7 @@ class depgraph(object): masked_pkg_instances.add(pkg) if atom.unevaluated_atom.use: if not pkg.iuse.is_valid_flag(atom.unevaluated_atom.use.required) \ - or atom.violated_conditionals(self._pkg_use_enabled(pkg), pkg.iuse.all).use: + or atom.violated_conditionals(self._pkg_use_enabled(pkg), pkg.iuse.is_valid_flag).use: missing_use.append(pkg) if not mreasons: continue @@ -2126,7 +2126,8 @@ class depgraph(object): # Lets see if the violated use deps are conditional. # If so, suggest to change them on the parent. mreasons = [] - violated_atom = atom.unevaluated_atom.violated_conditionals(self._pkg_use_enabled(pkg), pkg.iuse.all, myparent.use.enabled) + violated_atom = atom.unevaluated_atom.violated_conditionals(self._pkg_use_enabled(pkg), \ + pkg.iuse.is_valid_flag, myparent.use.enabled) if not (violated_atom.use.enabled or violated_atom.use.disabled): #all violated use deps are conditional changes = [] |