From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 6 Jan 2011 04:17:03 +0000 (-0800)
Subject: Scheduler: handle same cpv with different SLOT
X-Git-Tag: v2.1.9.30~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4bf0fd5c09e522f99175ecd0ca25279de51f491a;p=portage.git

Scheduler: handle same cpv with different SLOT
---

diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index 4ba683a52..da17eedab 100644
--- a/pym/_emerge/Scheduler.py
+++ b/pym/_emerge/Scheduler.py
@@ -1745,6 +1745,9 @@ class Scheduler(PollScheduler):
 		if pkg.operation != "uninstall":
 			vardb = pkg.root_config.trees["vartree"].dbapi
 			previous_cpv = vardb.match(pkg.slot_atom)
+			if not previous_cpv and vardb.cpv_exists(pkg.cpv):
+				# same cpv, different SLOT
+				previous_cpv = [pkg.cpv]
 			if previous_cpv:
 				previous_cpv = previous_cpv.pop()
 				pkg_to_replace = self._pkg(previous_cpv,