From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 20 Oct 2008 18:21:42 +0000 (-0000)
Subject: Handle the case that was intended to be fixed by r11702 (which got reverted).
X-Git-Tag: v2.2_rc13~77
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=707e77d45f3f2b57a2576d158af4265785896c80;p=portage.git

Handle the case that was intended to be fixed by r11702 (which got reverted).

svn path=/main/trunk/; revision=11705
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 03ee50eca..0cca793d5 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -5677,6 +5677,22 @@ class depgraph(object):
 					if pkg.cp == cp]
 				break
 
+		# If the installed version is in a different slot and it is higher than
+		# the highest available visible package, _iter_atoms_for_pkg() may fail
+		# to properly match the available package with a corresponding argument
+		# atom. Detect this case and correct it here.
+		if not selective and len(matched_packages) > 1 and \
+			matched_packages[-1].installed and \
+			matched_packages[-1].slot_atom != \
+			matched_packages[-2].slot_atom and \
+			matched_packages[-1] > matched_packages[-2]:
+			pkg = matched_packages[-2]
+			if pkg.root == self.target_root and \
+				self._set_atoms.findAtomForPackage(pkg):
+				# Select the available package instead
+				# of the installed package.
+				matched_packages.pop()
+
 		if len(matched_packages) > 1:
 			bestmatch = portage.best(
 				[pkg.cpv for pkg in matched_packages])