From 38720618e2382cae228b8b839203b26ab344a26c Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Thu, 03 Jan 2013 22:23:18 +0000
Subject: Check system before setting up the environ

---
(limited to 'commands')

diff --git a/commands/check-system b/commands/check-system
index f610bcb..f471f58 100755
--- a/commands/check-system
+++ b/commands/check-system
@@ -1,15 +1,10 @@
 #!/usr/bin/python -u
 
 import argparse
-import sys
 import os
 
 import common
 
-from devbot import system
-
-common.setup()
-
 parser = argparse.ArgumentParser(description='Check the system')
 parser.add_argument("--update", action="store_true",
                     help="first of all update the system")
@@ -21,8 +16,9 @@ args = parser.parse_args()
 
 interactive = "SUGAR_BUILDBOT" not in os.environ
 
-if not system.check(update=args.update,
-                   remove=args.remove,
-                   test=args.test,
-                   interactive=interactive):
-    sys.exit(1)
+check_args = {"update": args.update,
+              "remove": args.remove,
+              "test": args.test,
+              "interactive": interactive}
+
+common.setup(check_args=check_args)
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)
diff --git a/commands/pull b/commands/pull
index 7314278..4e3ca8f 100755
--- a/commands/pull
+++ b/commands/pull
@@ -6,7 +6,6 @@ import sys
 import common
 
 from devbot import build
-from devbot import system
 
 parser = argparse.ArgumentParser()
 parser.add_argument("module", nargs="?", help="name of the module to pull")
@@ -18,8 +17,5 @@ if args.module:
     if not build.pull_one(args.module):
         sys.exit(1)
 else:
-    if not system.check(lazy=True):
-        sys.exit(1)
-
     if not build.pull():
         sys.exit(1)
--
cgit v0.9.1