aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Dolbec <dolsen@gentoo.org>2017-07-10 21:43:39 +0000
committerZac Medico <zmedico@gentoo.org>2018-03-29 20:51:14 -0700
commit94338f575ac531d51e16af899357980232dcd443 (patch)
treee7df721d38194d84fb197a309e9a33787132f88f
parentrepoman: modules/scan/module.py: Prefix logging messages (diff)
downloadportage-94338f575ac531d51e16af899357980232dcd443.tar.gz
portage-94338f575ac531d51e16af899357980232dcd443.tar.bz2
portage-94338f575ac531d51e16af899357980232dcd443.zip
repoman: repos.py: Add masters_list
Use masters_list for loading QAData config. Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
-rw-r--r--repoman/pym/repoman/repos.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/repoman/pym/repoman/repos.py b/repoman/pym/repoman/repos.py
index b7c07bb94..e383dbfd1 100644
--- a/repoman/pym/repoman/repos.py
+++ b/repoman/pym/repoman/repos.py
@@ -42,10 +42,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)