From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 28 Oct 2011 05:38:31 +0000 (-0700)
Subject: RepoConfigLoader: comment on masters override
X-Git-Tag: v2.2.0_alpha72~41
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bcb6106c7547738bd00e31b53b0cec582e1ac84c;p=portage.git

RepoConfigLoader: comment on masters override
---

diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py
index 2cc8a0bdc..5b5ddd633 100644
--- a/pym/portage/repository/config.py
+++ b/pym/portage/repository/config.py
@@ -385,6 +385,8 @@ class RepoConfigLoader(object):
 			layout_filename = os.path.join(repo.location, "metadata", "layout.conf")
 			layout_data, layout_errors = parse_layout_conf(repo.location, repo.name)
 
+			# layout.conf masters may be overridden here if we have a masters
+			# setting from the user's repos.conf
 			if repo.masters is None:
 				repo.masters = layout_data['masters']