From d7a8f3d9893c3a6d3ad7732c889ee138c390a238 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 26 Nov 2010 22:30:19 -0800 Subject: [PATCH] depgraph: check unevaluated USE dep IUSE earlier --- pym/_emerge/depgraph.py | 14 +++++++------- 1 file 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"]): -- 2.26.2