RepoConfigLoader: handle equal priorities

Include repo.name in sort key, for predictable sorting even when
priorities are equal.

diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py
index 7c69fb42679f7c991616136a0df96e26fe862f09..7de695449287782b186eeba2053fac8ba04937de 100644 (file)
--- a/pym/portage/repository/config.py
+++ b/pym/portage/repository/config.py
@@ -616,9 +616,13 @@ class RepoConfigLoader(object):
                        # This happens if main-repo has been set in repos.conf.
                        prepos[main_repo].priority = -1000
 
+               # Include repo.name in sort key, for predictable sorting
+               # even when priorities are equal.
+               prepos_order = sorted(prepos.items(),
+                       key=lambda r:(r[1].priority or 0, repo.name))
+
                # filter duplicates from aliases, by only including
                # items where repo.name == key
-               prepos_order = sorted(prepos.items(), key=lambda r:r[1].priority or 0)
                prepos_order = [repo.name for (key, repo) in prepos_order
                        if repo.name == key and key != 'DEFAULT' and
                        repo.location is not None]