aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Dolbec <dolsen@gentoo.org>2017-07-15 00:11:13 +0000
committerZac Medico <zmedico@gentoo.org>2018-03-29 20:51:16 -0700
commitdfcd68afcf39fa2446dbf856e87eb7517e031ad8 (patch)
treede2cb1d3bffea1b5355088e716697d4725c8cb06
parentrepoman: Update qa_data.py to use the new load_config() utility (diff)
downloadportage-dfcd68afcf39fa2446dbf856e87eb7517e031ad8.tar.gz
portage-dfcd68afcf39fa2446dbf856e87eb7517e031ad8.tar.bz2
portage-dfcd68afcf39fa2446dbf856e87eb7517e031ad8.zip
repoman: Update modules/scan/module.py for linechecks config addition
-rw-r--r--repoman/pym/repoman/modules/scan/module.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/repoman/pym/repoman/modules/scan/module.py b/repoman/pym/repoman/modules/scan/module.py
index 166cc15ef..5d34eaef0 100644
--- a/repoman/pym/repoman/modules/scan/module.py
+++ b/repoman/pym/repoman/modules/scan/module.py
@@ -25,7 +25,7 @@ class ModuleConfig(object):
@param configpaths: ordered list of filepaths to load
'''
- self.configpaths = [os.path.join(path, 'repository.yml') for path in configpaths]
+ self.configpaths = [os.path.join(path, 'repository.yaml') for path in configpaths]
logging.debug("ModuleConfig; configpaths: %s", self.configpaths)
self.controller = Modules(path=MODULES_PATH, namepath="repoman.modules.scan")
@@ -41,13 +41,17 @@ class ModuleConfig(object):
for loop in ['pkgs', 'ebuilds', 'final']:
logging.debug("ModuleConfig; Processing loop %s", loop)
setattr(self, '%s_loop' % loop, self._determine_list(loop))
+ self.linechecks = stack_lists(c['linechecks_modules'].split() for c in self._configs)
def load_configs(self, configpaths=None):
- '''load the config files in order'''
+ '''load the config files in order
+
+ @param configpaths: ordered list of filepaths to load
+ '''
if configpaths:
self.configpaths = configpaths
elif not self.configpaths:
- logging.error("ModuleConfig; Error: No repository.yml files defined")
+ logging.error("ModuleConfig; Error: No repository.yaml files defined")
configs = []
for path in self.configpaths:
logging.debug("ModuleConfig; Processing: %s", path)