diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-03-26 10:10:24 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-03-26 10:10:24 -0700 |
| commit | e2981b3398620968dcf3bb5d3c3d6c0f7714d136 (patch) | |
| tree | f624d67a6611b5cdc3b78509ff49f1de13cfafc9 /pym | |
| parent | 81cd62d4db039995f291c724ab12afbaaf9ae596 (diff) | |
| download | portage-e2981b3398620968dcf3bb5d3c3d6c0f7714d136.tar.gz portage-e2981b3398620968dcf3bb5d3c3d6c0f7714d136.tar.bz2 portage-e2981b3398620968dcf3bb5d3c3d6c0f7714d136.zip | |
Scheduler: pkg_to_replace beware old-style virt
Diffstat (limited to 'pym')
| -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 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] |