From: Daniel Hornung Date: Fri, 3 Feb 2012 22:33:35 +0000 (-0800) Subject: Honor repos.conf for overlay priority, bug 402099 X-Git-Tag: v2.2.0_alpha85~2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9ad263416ec282d8c6cf007ca84bf716c49c4f69;p=portage.git Honor repos.conf for overlay priority, bug 402099 Signed-off-by: Zac Medico --- diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py index 3207b3087..ebee234c3 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -341,7 +341,7 @@ class RepoConfigLoader(object): if repos_conf_opts is not None: # Selectively copy only the attributes which # repos.conf is allowed to override. - for k in ('aliases', 'eclass_overrides', 'masters'): + for k in ('aliases', 'eclass_overrides', 'masters', 'priority'): v = getattr(repos_conf_opts, k, None) if v is not None: setattr(repo, k, v) @@ -356,7 +356,7 @@ class RepoConfigLoader(object): if ov == portdir and portdir not in port_ov: repo.priority = -1000 - else: + elif repo.priority is None: repo.priority = base_priority base_priority += 1