From 442828eb2f64a45c04d1baae1cce358b32dcaf3b Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 29 Apr 2010 06:23:10 -0700 Subject: Tweak packages_with_invalid_use_config handling: * Ignore IUSE since those can't be changed by the user. * Only add unbuilt ebuilds to the list since USE can't be changed for built ebuilds. --- pym/_emerge/depgraph.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'pym') diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 005c2979c..3164e339e 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2476,6 +2476,10 @@ class depgraph(object): continue if dont_miss_updates: + # Check if a higher version was rejected due to user + # USE configuration. The packages_with_invalid_use_config + # list only contains unbuilt ebuilds since USE can't + # be changed for built packages. higher_version_rejected = False for rejected in packages_with_invalid_use_config: if rejected.cp != pkg.cp: @@ -2566,16 +2570,16 @@ class depgraph(object): missing_iuse = True break if missing_iuse: - if not pkg.installed: - packages_with_invalid_use_config.append(pkg) + # Don't add this to packages_with_invalid_use_config + # since IUSE cannot be adjusted by the user. continue if atom.use.enabled.difference(pkg.use.enabled): - if not pkg.installed: + if not pkg.built: packages_with_invalid_use_config.append(pkg) continue if atom.use.disabled.intersection(pkg.use.enabled): - if not pkg.installed: + if not pkg.built: packages_with_invalid_use_config.append(pkg) continue -- cgit v1.2.3-1-g7c22