From 72cf705dd6b93a405c90c3f904c224ac2b122eb0 Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Sat, 17 Nov 2012 22:12:14 +0000
Subject: Move packages json to a separate dir

---
(limited to 'devbot/config.py')

diff --git a/devbot/config.py b/devbot/config.py
index 70f9180..abd3e94 100644
--- a/devbot/config.py
+++ b/devbot/config.py
@@ -84,22 +84,23 @@ def get_module_build_dir(module):
 def load_packages():
     packages = {}
 
-    for package_file in package_files:
-        deps = _load_deps_json(package_file)
-        for key, value in deps.items():
-            packages[key] = value
+    for file in package_files:
+        path = os.path.join(config_dir, "packages", "%s.json" % file)
+        packages.update(json.load(open(path)))
 
     return packages
 
 def load_prerequisites():
-    return _load_deps_json("prerequisites")
+    path = os.path.join(config_dir, "deps", "prerequisites.json")
+    return json.load(open(path))
 
 def load_checks():
     version = distro.get_system_version()
 
     checks = []
-    for check_file in dep_files:
-        checks.extend(_load_deps_json(check_file))
+    for file in dep_files:
+        path = os.path.join(config_dir, "deps", "%s.json" % file)
+        checks.extend(json.load(open(path)))
 
     return checks
 
@@ -112,12 +113,8 @@ def load_modules():
 
     modules = []
 
-    for module_file in module_files:
-        path = os.path.join(config_dir, "modules", module_file)
+    for file in module_files:
+        path = os.path.join(config_dir, "modules", file)
         modules.extend(json.load(open(path)))
 
     return modules
-
-def _load_deps_json(name):
-    path = os.path.join(config_dir, "deps", "%s.json" % name)
-    return json.load(open(path))
--
cgit v0.9.1