RepoConfigLoader: masters eclass override order

Only append the current repo to eclass_locations if it's not there
already. This allows masters to have more control over eclass override
order, which may be useful for scenarios in which there is a plan to
migrate eclasses to a master repo. Thanks to Brian Harring
<ferringb@gentoo.org) for suggesting this behavior.

diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py
index 4a8d8666eee8c7c67c4eccc1a39d0f92176ac0f0..0222253e25f9028af371e744793715761b4779ca 100644 (file)
--- a/pym/portage/repository/config.py
+++ b/pym/portage/repository/config.py
@@ -531,7 +531,12 @@ class RepoConfigLoader(object):
 
                        eclass_locations = []
                        eclass_locations.extend(master_repo.location for master_repo in repo.masters)
-                       eclass_locations.append(repo.location)
+                       # Only append the current repo to eclass_locations if it's not
+                       # there already. This allows masters to have more control over
+                       # eclass override order, which may be useful for scenarios in
+                       # which there is a plan to migrate eclasses to a master repo.
+                       if repo.location not in eclass_locations:
+                               eclass_locations.append(repo.location)
 
                        if repo.eclass_overrides:
                                for other_repo_name in repo.eclass_overrides: