summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-11-26 22:30:19 -0800
committerZac Medico <zmedico@gentoo.org>2010-11-26 22:30:19 -0800
commitd7a8f3d9893c3a6d3ad7732c889ee138c390a238 (patch)
treed088828c69323e878e8ec3f03fa84781d77eeb66
parentd3fcffbaa52bd5294e06645d134c39ec8e3b8f41 (diff)
downloadportage-d7a8f3d9893c3a6d3ad7732c889ee138c390a238.tar.gz
portage-d7a8f3d9893c3a6d3ad7732c889ee138c390a238.tar.bz2
portage-d7a8f3d9893c3a6d3ad7732c889ee138c390a238.zip
depgraph: check unevaluated USE dep IUSE earlier
-rw-r--r--pym/_emerge/depgraph.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index e2d16453e..f2039e4e0 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -2964,6 +2964,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
@@ -3017,13 +3024,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"]):