diff options
author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-11-17 20:18:46 (GMT) |
---|---|---|
committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-11-17 20:18:46 (GMT) |
commit | 4e83540a10dc4a3869b39896d62e033c22fea195 (patch) | |
tree | 581b386b847f9242fce17f17609a129f9ea637cd /devbot | |
parent | 183086b35c610a58e1404a907ec2dda50be45b52 (diff) |
Fix refactoring regressions
Diffstat (limited to 'devbot')
-rw-r--r-- | devbot/config.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/devbot/config.py b/devbot/config.py index bd25cf7..70f9180 100644 --- a/devbot/config.py +++ b/devbot/config.py @@ -82,9 +82,14 @@ def get_module_build_dir(module): return os.path.join(build_dir, module["name"]) def load_packages(): - packages = [] + packages = {} + for package_file in package_files: - packages.extend(_load_deps_json(package_file)) + deps = _load_deps_json(package_file) + for key, value in deps.items(): + packages[key] = value + + return packages def load_prerequisites(): return _load_deps_json("prerequisites") @@ -116,4 +121,3 @@ def load_modules(): def _load_deps_json(name): path = os.path.join(config_dir, "deps", "%s.json" % name) return json.load(open(path)) - |