From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 26 Mar 2011 17:10:24 +0000 (-0700)
Subject: Scheduler: pkg_to_replace beware old-style virt
X-Git-Tag: v2.1.9.45~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6c3cbfebdcf5b461d068ac1515bbd297052d8602;p=portage.git

Scheduler: pkg_to_replace beware old-style virt
---

diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index e4b6926c3..8ee96eb7a 100644
--- a/pym/_emerge/Scheduler.py
+++ b/pym/_emerge/Scheduler.py
@@ -1797,7 +1797,8 @@ class Scheduler(PollScheduler):
 		pkg_to_replace = None
 		if pkg.operation != "uninstall":
 			vardb = pkg.root_config.trees["vartree"].dbapi
-			previous_cpv = vardb.match(pkg.slot_atom)
+			previous_cpv = [x for x in vardb.match(pkg.slot_atom) \
+				if portage.cpv_getkey(x) == pkg.cp]
 			if not previous_cpv and vardb.cpv_exists(pkg.cpv):
 				# same cpv, different SLOT
 				previous_cpv = [pkg.cpv]