4 files changed, 16 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 17a03d5..0521b19 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ BASE_DIR=$(CURDIR)
 
 .PHONY: all
 
-all: check-system pull build
+all: pull build
 
 include Makefile.config
 include Makefile.commands
diff --git a/commands/build b/commands/build
index 6911394..d86fecd 100755
--- a/commands/build
+++ b/commands/build
@@ -5,6 +5,7 @@ import sys
 
 import common
 
+from devbot import system
 from devbot import build
 
 parser = argparse.ArgumentParser()
@@ -13,6 +14,9 @@ args = parser.parse_args()
 
 common.setup()
 
+if not system.check(skip_if_unchanged=True):
+   sys.exit(1)
+
 if args.module:
     success = build.build_one(args.module)
 else:
diff --git a/commands/check-system b/commands/check-system
index 6655775..f610bcb 100755
--- a/commands/check-system
+++ b/commands/check-system
@@ -1,6 +1,7 @@
 #!/usr/bin/python -u
 
 import argparse
+import sys
 import os
 
 import common
@@ -20,7 +21,8 @@ args = parser.parse_args()
 
 interactive = "SUGAR_BUILDBOT" not in os.environ
 
-system.check(update=args.update,
-             remove=args.remove,
-             test=args.test,
-             interactive=interactive)
+if not system.check(update=args.update,
+                   remove=args.remove,
+                   test=args.test,
+                   interactive=interactive):
+    sys.exit(1)
diff --git a/devbot/system.py b/devbot/system.py
index bf4932e..4b014a8 100644
--- a/devbot/system.py
+++ b/devbot/system.py
@@ -158,7 +158,7 @@ def check(remove=False, update=False, test=False, interactive=True,
           skip_if_unchanged=False):
     if skip_if_unchanged:
         if state.system_check_is_unchanged():
-            return
+            return True
 
     package_manager = \
         distro.get_package_manager(test=test, interactive=interactive)
@@ -169,12 +169,12 @@ def check(remove=False, update=False, test=False, interactive=True,
 
     checks = config.load_prerequisites()
     if not run_checks(package_manager, checks, packages):
-        sys.exit(1)
+        return False
 
     xvfb_proc, orig_display = xvfb.start()
 
     if not run_checks(package_manager, config.load_checks(), packages):
-        sys.exit(1)
+        return False
 
     xvfb.stop(xvfb_proc, orig_display)
 
@@ -187,3 +187,5 @@ def check(remove=False, update=False, test=False, interactive=True,
         remove_packages(package_manager, packages)
 
     state.system_check_touch()
+
+    return True