| 1 |
commit: 9ad263416ec282d8c6cf007ca84bf716c49c4f69 |
| 2 |
Author: Daniel Hornung <daniel.hornung <AT> gmx <DOT> de> |
| 3 |
AuthorDate: Fri Feb 3 22:33:35 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 3 22:33:35 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9ad26341 |
| 7 |
|
| 8 |
Honor repos.conf for overlay priority, bug 402099 |
| 9 |
|
| 10 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 11 |
|
| 12 |
--- |
| 13 |
pym/portage/repository/config.py | 4 ++-- |
| 14 |
1 files changed, 2 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py |
| 17 |
index 3207b30..ebee234 100644 |
| 18 |
--- a/pym/portage/repository/config.py |
| 19 |
+++ b/pym/portage/repository/config.py |
| 20 |
@@ -341,7 +341,7 @@ class RepoConfigLoader(object): |
| 21 |
if repos_conf_opts is not None: |
| 22 |
# Selectively copy only the attributes which |
| 23 |
# repos.conf is allowed to override. |
| 24 |
- for k in ('aliases', 'eclass_overrides', 'masters'): |
| 25 |
+ for k in ('aliases', 'eclass_overrides', 'masters', 'priority'): |
| 26 |
v = getattr(repos_conf_opts, k, None) |
| 27 |
if v is not None: |
| 28 |
setattr(repo, k, v) |
| 29 |
@@ -356,7 +356,7 @@ class RepoConfigLoader(object): |
| 30 |
|
| 31 |
if ov == portdir and portdir not in port_ov: |
| 32 |
repo.priority = -1000 |
| 33 |
- else: |
| 34 |
+ elif repo.priority is None: |
| 35 |
repo.priority = base_priority |
| 36 |
base_priority += 1 |
Archives