commit: fd099557cf568806baf3f67d57292ef66bbc590d
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 10 21:43:39 2017 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Jul 10 22:29:34 2017 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=fd099557
repoman: repos.py: Add masters_list
Use masters_list for loading QAData config.
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>
repoman/pym/repoman/repos.py | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/repoman/pym/repoman/repos.py b/repoman/pym/repoman/repos.py
index accbf1d9c..605c7cffe 100644
--- a/repoman/pym/repoman/repos.py
+++ b/repoman/pym/repoman/repos.py
@@ -41,10 +41,18 @@ class RepoSettings(object):
except KeyError:
self._add_repo(config_root, portdir_overlay)
+ # Determine the master config loading list
+ self.masters_list = []
+ # get out repo masters value
+ masters =
self.repositories.get_repo_for_location(self.repodir).masters
+ for repo in masters:
+ self.masters_list.append(os.path.join(repo.location,
'metadata', 'repoman'))
+ self.masters_list.append(os.path.join(self.repodir, 'metadata',
'repoman'))
+
logging.debug("RepoSettings: init(); load qadata")
# load the repo specific configuration
self.qadata = qadata
- if not self.qadata.load_repo_config(self.repodir, options):
+ if not self.qadata.load_repo_config(self.masters_list, options):
logging.error("Aborting...")
sys.exit(1)
logging.debug("RepoSettings: qadata loaded: %s", qadata.no_exec)
