Check system before setting up the environ

1 files changed, 13 insertions, 10 deletions

diff --git a/commands/common.py b/commands/common.py
index 4091545..62b53b5 100644
--- a/commands/common.py
+++ b/commands/common.py
@@ -8,13 +8,16 @@ sys.path.append(base_dir)
 from devbot import main
 
 
-def setup(log_name=None):
-    main.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,
-                "log_name": log_name})
+def setup(log_name=None, check_args={}):
+    config_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"),
+                   "relocatable": "SUGAR_BUILDBOT" in os.environ,
+                   "log_name": log_name}
+
+    if not main.setup(config_args, check_args):
+        sys.exit(1)