diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-01-12 16:51:36 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-01-12 16:51:36 +0000 |
| commit | 7b73805974a373d80bebd15828115b02faa068f8 (patch) | |
| tree | e0fbe43d737c268f74bbcb31478a22ddad79bc53 | |
| parent | bea873db6dc3a237079d984e0333d6c6d01e48ec (diff) | |
| download | portage-7b73805974a373d80bebd15828115b02faa068f8.tar.gz portage-7b73805974a373d80bebd15828115b02faa068f8.tar.bz2 portage-7b73805974a373d80bebd15828115b02faa068f8.zip | |
When checking for conflicts between packages inside depgraph._greedy_slots(),
never double-check any of the pairs. (trunk r12486)
svn path=/main/branches/2.1.6/; revision=12487
| -rw-r--r-- | pym/_emerge/__init__.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 922a28d2d..b850e9483 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -5685,14 +5685,14 @@ class depgraph(object): # If two packages conflict, discard the lower version. discard_pkgs = set() greedy_pkgs.sort(reverse=True) - for pkg1 in greedy_pkgs: + for i in xrange(len(greedy_pkgs) - 1): + pkg1 = greedy_pkgs[i] if pkg1 in discard_pkgs: continue - for pkg2 in greedy_pkgs: + for j in xrange(i + 1, len(greedy_pkgs)): + pkg2 = greedy_pkgs[j] if pkg2 in discard_pkgs: continue - if pkg1 is pkg2: - continue if blockers[pkg1].findAtomForPackage(pkg2) or \ blockers[pkg2].findAtomForPackage(pkg1): # pkg1 > pkg2 |