From 5a418fda4c53ef634cb08cff6bd1a3b24cf0b918 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 5 Jan 2011 20:17:03 -0800 Subject: Scheduler: handle same cpv with different SLOT --- pym/_emerge/Scheduler.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pym/_emerge/Scheduler.py') diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index 312a7a30e..eb70e80dd 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -1747,6 +1747,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, -- cgit v1.2.3-1-g7c22