summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-01-12 16:47:01 +0000
committerZac Medico <zmedico@gentoo.org>2009-01-12 16:47:01 +0000
commit5b52509c353c478bcc015949ce8da500d2c3b52a (patch)
tree23c58261c6f71b22e1f9a5f447e7cdf9c0a2dd1d
parentInvalidate some more caches inside depgraph._set_args(). (diff)
downloadportage-multirepo-5b52509c353c478bcc015949ce8da500d2c3b52a.tar.gz
portage-multirepo-5b52509c353c478bcc015949ce8da500d2c3b52a.tar.bz2
portage-multirepo-5b52509c353c478bcc015949ce8da500d2c3b52a.zip
When checking for conflicts between packages inside depgraph._greedy_slots(),
never double-check any of the pairs. svn path=/main/trunk/; revision=12486
-rw-r--r--pym/_emerge/__init__.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index dc1d932a..9120cf80 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -5701,14 +5701,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