diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-03-26 10:10:24 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-03-26 12:30:15 -0700 |
| commit | 6c3cbfebdcf5b461d068ac1515bbd297052d8602 (patch) | |
| tree | 21247b45c6435905f20ded355e3fdfa83aca58c4 | |
| parent | 82ddeef5eb825e1661d8a6fb0bb6658306671978 (diff) | |
| download | portage-6c3cbfebdcf5b461d068ac1515bbd297052d8602.tar.gz portage-6c3cbfebdcf5b461d068ac1515bbd297052d8602.tar.bz2 portage-6c3cbfebdcf5b461d068ac1515bbd297052d8602.zip | |
Scheduler: pkg_to_replace beware old-style virt
| -rw-r--r-- | pym/_emerge/Scheduler.py | 3 |
1 files changed, 2 insertions, 1 deletions
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] |