Honor repos.conf for overlay priority, bug 402099

Signed-off-by: Zac Medico <zmedico@gentoo.org>

diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py
index 3207b3087e7297a06a94cc7253f1bd2e93cfc0b0..ebee234c31d654da8b444a7bb8c9fa7fb1187edd 100644 (file)
--- 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