diff options
| author | Daniel Hornung <daniel.hornung@gmx.de> | 2012-02-03 14:33:35 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-02-03 14:33:35 -0800 |
| commit | 9ad263416ec282d8c6cf007ca84bf716c49c4f69 (patch) | |
| tree | e7b0a915365048f78e545d62b41482f2dabee481 /pym/portage/repository/config.py | |
| parent | 9e4b06838cef9a10468a6e3d220cc4f2154939e1 (diff) | |
| download | portage-9ad263416ec282d8c6cf007ca84bf716c49c4f69.tar.gz portage-9ad263416ec282d8c6cf007ca84bf716c49c4f69.tar.bz2 portage-9ad263416ec282d8c6cf007ca84bf716c49c4f69.zip | |
Honor repos.conf for overlay priority, bug 402099
Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'pym/portage/repository/config.py')
| -rw-r--r-- | pym/portage/repository/config.py | 4 |
1 files changed, 2 insertions, 2 deletions
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 |