diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-11-26 22:30:19 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-11-26 22:35:40 -0800 |
| commit | ec7d1a919c765d779240f9c9ddbc37b0d4afcf86 (patch) | |
| tree | 6bf6088dbad13b6e5568798f487ba517d5821115 /pym | |
| parent | edfb52885d8d9891c7d91ed8923ded0dc966ec6a (diff) | |
| download | portage-ec7d1a919c765d779240f9c9ddbc37b0d4afcf86.tar.gz portage-ec7d1a919c765d779240f9c9ddbc37b0d4afcf86.tar.bz2 portage-ec7d1a919c765d779240f9c9ddbc37b0d4afcf86.zip | |
depgraph: check unevaluated USE dep IUSE earlier
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/depgraph.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index fecadd3c1..7472682fc 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2934,6 +2934,13 @@ class depgraph(object): if not installed and myarg: found_available_arg = True + if atom.unevaluated_atom.use: + #Make sure we don't miss a 'missing IUSE'. + if pkg.iuse.get_missing_iuse(atom.unevaluated_atom.use.required): + # Don't add this to packages_with_invalid_use_config + # since IUSE cannot be adjusted by the user. + continue + if atom.use: if pkg.iuse.get_missing_iuse(atom.use.required): # Don't add this to packages_with_invalid_use_config @@ -2987,13 +2994,6 @@ class depgraph(object): if not use_match: continue - elif atom.unevaluated_atom.use: - #Make sure we don't miss a 'missing IUSE'. - if pkg.iuse.get_missing_iuse(atom.unevaluated_atom.use.required): - # Don't add this to packages_with_invalid_use_config - # since IUSE cannot be adjusted by the user. - continue - #check REQUIRED_USE constraints if not pkg.built and pkg.metadata["REQUIRED_USE"] and \ eapi_has_required_use(pkg.metadata["EAPI"]): |