diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-04-29 06:23:10 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-04-29 06:23:10 -0700 |
| commit | 442828eb2f64a45c04d1baae1cce358b32dcaf3b (patch) | |
| tree | 5aff165beef84b7d0b78f029d7a33e1c29f0cc50 | |
| parent | 87250d0cdfa74598f1564668cc446cd3ae1cf9a0 (diff) | |
| download | portage-442828eb2f64a45c04d1baae1cce358b32dcaf3b.tar.gz portage-442828eb2f64a45c04d1baae1cce358b32dcaf3b.tar.bz2 portage-442828eb2f64a45c04d1baae1cce358b32dcaf3b.zip | |
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.
| -rw-r--r-- | pym/_emerge/depgraph.py | 12 |
1 files changed, 8 insertions, 4 deletions
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 |