From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 6 Aug 2010 23:27:26 +0000 (-0700)
Subject: Fix _select_pkg_highest_available_imp to reject installed packages
X-Git-Tag: v2.2_rc68~373
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a32038ffb00db6e65cdee26ca7cd08ada4b33208;p=portage.git

Fix _select_pkg_highest_available_imp to reject installed packages
returned from _wrapped_select_pkg_highest_available_imp when
necessary.
---

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 3b604f04f..c05679561 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")