diff options
author | Zac Medico <zmedico@gentoo.org> | 2011-01-05 20:17:03 -0800 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-01-05 20:18:30 -0800 |
commit | 4bf0fd5c09e522f99175ecd0ca25279de51f491a (patch) | |
tree | 8ebe0778468a071f5dad737ae2ad913ac7351cb9 /pym/_emerge | |
parent | 1ef66bb7b493ffb6f8060e9983b69ab47748d249 (diff) | |
download | portage-4bf0fd5c09e522f99175ecd0ca25279de51f491a.tar.gz portage-4bf0fd5c09e522f99175ecd0ca25279de51f491a.tar.bz2 portage-4bf0fd5c09e522f99175ecd0ca25279de51f491a.zip |
Scheduler: handle same cpv with different SLOT
Diffstat (limited to 'pym/_emerge')
-rw-r--r-- | pym/_emerge/Scheduler.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index 4ba683a52..da17eedab 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -1745,6 +1745,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, |