summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-06 16:27:26 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-06 16:27:26 -0700
commita32038ffb00db6e65cdee26ca7cd08ada4b33208 (patch)
tree24423cea25cccf9895e67aa9b9e3d3d9f1401947
parentRename allow_missing_keywords to allow_unstable_keywords since that's (diff)
downloadportage-multirepo-a32038ffb00db6e65cdee26ca7cd08ada4b33208.tar.gz
portage-multirepo-a32038ffb00db6e65cdee26ca7cd08ada4b33208.tar.bz2
portage-multirepo-a32038ffb00db6e65cdee26ca7cd08ada4b33208.zip
Fix _select_pkg_highest_available_imp to reject installed packages
returned from _wrapped_select_pkg_highest_available_imp when necessary.
-rw-r--r--pym/_emerge/depgraph.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 3b604f04..c0567956 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -2545,6 +2545,11 @@ class depgraph(object):
root, atom, onlydeps=onlydeps,
allow_use_changes=True, allow_unstable_keywords=allow_unstable_keywords)
+ if pkg is not None and \
+ pkg.installed and \
+ not self._want_installed_pkg(pkg):
+ pkg = None
+
if pkg is not None and not pkg.visible:
self._dynamic_config._needed_user_config_changes.setdefault(pkg, set()).add("unstable keyword")