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.

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 005c2979c0c924f42c1e012f15fcf0972f53ed23..3164e339ee4ec25f496ee9fcc2e7cdc7244de707 100644 (file)
--- 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