diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-03-23 01:27:16 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-03-23 01:27:16 +0000 |
commit | 5f6b887f309a2aa369d08028e976163224d9b988 (patch) | |
tree | bfd2e581553893c5598599a2cf1e80a5ca242d93 | |
parent | 2f341cdba252e737fa0f59dcc0a0c03a8beeb80f (diff) | |
download | portage-5f6b887f309a2aa369d08028e976163224d9b988.tar.gz portage-5f6b887f309a2aa369d08028e976163224d9b988.tar.bz2 portage-5f6b887f309a2aa369d08028e976163224d9b988.zip |
For bug #171840, consider all choices for slot intersection and promote those that have upgrades relative to other choices. (trunk r6266:6267)
svn path=/main/branches/2.1.2/; revision=6268
-rw-r--r-- | pym/portage.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pym/portage.py b/pym/portage.py index ea702dd25..5b2ef1a6a 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -4228,10 +4228,15 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None): # into || ( highest version ... lowest version ). We want to prefer the # highest all_available version of the new-style virtual when there is a # lower all_installed version. - for possible_upgrade in list(possible_upgrades): + preferred.extend(possible_upgrades) + possible_upgrades = preferred[1:] + for possible_upgrade in possible_upgrades: atoms, versions, all_available = possible_upgrade myslots = set(versions) for other_choice in preferred: + if possible_upgrade is other_choice: + # possible_upgrade will not be promoted, so move on + break o_atoms, o_versions, o_all_available = other_choice intersecting_slots = myslots.intersection(o_versions) if not intersecting_slots: @@ -4248,11 +4253,10 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None): has_downgrade = True break if has_upgrade and not has_downgrade: + preferred.remove(possible_upgrade) o_index = preferred.index(other_choice) preferred.insert(o_index, possible_upgrade) - possible_upgrades.remove(possible_upgrade) break - preferred.extend(possible_upgrades) # preferred now contains a) and c) from the order above with # the masked flag differentiating the two. other contains b) |