From: Zac Medico Date: Thu, 6 Jan 2011 04:17:03 +0000 (-0800) Subject: Scheduler: handle same cpv with different SLOT X-Git-Tag: v2.2.0_alpha14~1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5a418fda4c53ef634cb08cff6bd1a3b24cf0b918;p=portage.git Scheduler: handle same cpv with different SLOT --- 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,