diff options
author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-11-30 13:28:35 (GMT) |
---|---|---|
committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-11-30 13:28:35 (GMT) |
commit | 11a17ac1ccd59e428af735955b2007b2e1fcb982 (patch) | |
tree | 54eb38d746f42c4f2e7d772aa2a0acda2cdf466a /devbot/config.py | |
parent | d0752119848004ffcc0bc1f602de146b7c20dd15 (diff) |
Test the list of modules
Diffstat (limited to 'devbot/config.py')
-rw-r--r-- | devbot/config.py | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/devbot/config.py b/devbot/config.py index ed65c3a..a5f9428 100644 --- a/devbot/config.py +++ b/devbot/config.py @@ -22,7 +22,6 @@ etc_dir = None libexec_dir = None home_dir = None dep_files = None -module_files = None package_files = None prefs_path = None @@ -169,10 +168,6 @@ def set_dep_files(files): global dep_files dep_files = files -def set_module_files(files): - global module_files - module_files = files - def set_package_files(files): global package_files package_files = files @@ -184,7 +179,7 @@ def set_prefs_path(path): def _read_prefs(): global prefs_path - if not os.path.exists(prefs_path): + if prefs_path is None or not os.path.exists(prefs_path): return {} prefs = {} @@ -199,6 +194,9 @@ def _read_prefs(): def _save_prefs(prefs): global prefs_path + if prefs_path is None: + return + with open(prefs_path, "w") as f: for pref in prefs.items(): f.write("%s\n" % "=".join(pref)) @@ -248,17 +246,17 @@ def load_checks(): return filter(_filter_if, checks) def load_modules(): - global module_files - - modules = [] + module_dir = os.path.join(config_dir, "modules") - for file in module_files: - path = os.path.join(config_dir, "modules", file) + with open(os.path.join(module_dir, "index.json")) as f: + modules = [] + for module_file in json.load(f): + path = os.path.join(module_dir, module_file) - for info in json.load(open(path)): - modules.append(Module(info)) + for info in json.load(open(path)): + modules.append(Module(info)) - return modules + return modules def clean(): try: |