aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-10-22 10:41:50 -0700
committerZac Medico <zmedico@gentoo.org>2010-10-22 10:41:50 -0700
commit25262e2997ff92ec2ffdc17c2261c38fb04b6328 (patch)
tree02d455ca319cf8be40aadf19e587bd624a079220 /pym/portage/repository
parentFix RepoConfig.info_string() for aliases. (diff)
downloadportage-25262e2997ff92ec2ffdc17c2261c38fb04b6328.tar.gz
portage-25262e2997ff92ec2ffdc17c2261c38fb04b6328.tar.bz2
portage-25262e2997ff92ec2ffdc17c2261c38fb04b6328.zip
Support aliases in metadata/layout.conf.
This was requested by Daniel Robbins <drobbins@funtoo.org> so that the funtoo repository can set 'aliases = gentoo' in layout.conf, relieving funtoo users from the need to do a manual alias configuration in /etc/portage/repos.conf.
Diffstat (limited to 'pym/portage/repository')
-rw-r--r--pym/portage/repository/config.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py
index 36dee484a..1f2e48012 100644
--- a/pym/portage/repository/config.py
+++ b/pym/portage/repository/config.py
@@ -299,6 +299,16 @@ class RepoConfigLoader(object):
masters = None
repo.masters = masters
+ aliases = layout_data.get('aliases')
+ if aliases and aliases.strip():
+ aliases = aliases.split()
+ else:
+ aliases = None
+ if aliases:
+ if repo.aliases:
+ aliases.extend(repo.aliases)
+ repo.aliases = tuple(sorted(set(aliases)))
+
#Take aliases into account.
new_prepos = {}
for repo_name, repo in prepos.items():