From e2981b3398620968dcf3bb5d3c3d6c0f7714d136 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 26 Mar 2011 10:10:24 -0700 Subject: [PATCH] Scheduler: pkg_to_replace beware old-style virt --- pym/_emerge/Scheduler.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index 7d34d706a..06eeed5b1 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -1799,7 +1799,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] -- 2.26.2