From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 13 Dec 2011 22:19:05 +0000 (-0800)
Subject: RepoConfigLoader: masters eclass override order
X-Git-Tag: v2.2.0_alpha81~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=84dc400e53a715294615942021b8d0816e68e699;p=portage.git

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 4a8d8666e..0222253e2 100644
--- 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: