From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 31 Mar 2008 21:08:10 +0000 (-0000)
Subject: Fix package selection logic to always properly reject the installed package
X-Git-Tag: v2.1.5~271
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1c9e38f9f01deef58aecfc619fd5605503f2f09a;p=portage.git

Fix package selection logic to always properly reject the installed package
when another is available and the user wants to reinstall. (trunk r9652)

svn path=/main/branches/2.1.2/; revision=9653
---

diff --git a/bin/emerge b/bin/emerge
index d912176b6..f9ea202a1 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2353,8 +2353,10 @@ class depgraph:
 						cpv=cpv, metadata=metadata,
 						built=built, installed=installed,
 						onlydeps=onlydeps)
-					if installed and want_reinstall:
-						matched_packages.insert(0, pkg)
+					if installed and want_reinstall and matched_packages:
+						# Reject the installed package unless
+						# there are no other matches.
+						break
 					else:
 						matched_packages.append(pkg)
 					if reinstall_for_flags: