Use index.json for packages and deps too

1 files changed, 10 insertions, 20 deletions

diff --git a/commands/common.py b/commands/common.py
index 542a1f6..37a8abf 100644
--- a/commands/common.py
+++ b/commands/common.py
@@ -9,29 +9,19 @@ from devbot import config
 from devbot import command
 
 def setup():
-    config.setup(config_dir=os.path.join(base_dir, "config"),
-                 install_dir=os.path.join(base_dir, "install"),
-                 source_dir=os.path.join(base_dir, "source"),
-                 build_dir=os.path.join(base_dir, "build"),
-                 state_dir=os.path.join(base_dir, "state"),
-                 prefs_path=os.path.join(base_dir, "prefs"),
-                 logs_dir=os.path.join(base_dir, "logs"),
-                 relocatable="SUGAR_BUILDBOT" in os.environ)
-
-    dep_files = ["system",
-                 "sugar-build",
-                 "sugar-buildtime",
-                 "sugar-runtime"]
-
-    config.set_dep_files(dep_files)
-
-    package_files = ["basesystem",
-                     "deps"]
+    args = {"config_dir": os.path.join(base_dir, "config"),
+            "install_dir": os.path.join(base_dir, "install"),
+            "source_dir": os.path.join(base_dir, "source"),
+            "build_dir": os.path.join(base_dir, "build"),
+            "state_dir": os.path.join(base_dir, "state"),
+            "prefs_path": os.path.join(base_dir, "prefs"),
+            "logs_dir": os.path.join(base_dir, "logs")}
 
     if "SUGAR_BUILDBOT" in os.environ:
-        package_files.append("buildslave")
+        args["relocatable"] = True
+        args["extra_package_files"] = ["buildslave.json"]
 
-    config.set_package_files(package_files)
+    config.setup(**args)
 
     tools_dir = os.path.join(base_dir, "tools")
     command.set_logger(os.path.join(tools_dir, "log-command"))