projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b6c981f
)
RepoConfigLoader: comment on masters override
author
Zac Medico
<zmedico@gentoo.org>
Fri, 28 Oct 2011 05:38:31 +0000
(22:38 -0700)
committer
Zac Medico
<zmedico@gentoo.org>
Fri, 28 Oct 2011 05:38:31 +0000
(22:38 -0700)
pym/portage/repository/config.py
patch
|
blob
|
history
diff --git
a/pym/portage/repository/config.py
b/pym/portage/repository/config.py
index 2cc8a0bdc2db291eeca299eb040c12172a127d83..5b5ddd633b1386b7b4a3a9b0ef3836793c8da277 100644
(file)
--- 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']