Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--devbot/config.py10
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))
-