Check system directly in the commands

5 files changed, 7 insertions, 3 deletions

diff --git a/Makefile.commands b/Makefile.commands
index 07b71b6..3b34341 100644
--- a/Makefile.commands
+++ b/Makefile.commands
@@ -6,7 +6,7 @@ auto-install:
 check-system:
 	@$(COMMANDS_DIR)/check-system $(ARGS)
 
-build: check-system
+build:
 	@$(COMMANDS_DIR)/build
 
 run: helpers-build
diff --git a/commands/helpers/build b/commands/helpers/build
index 99f3048..1904955 100755
--- a/commands/helpers/build
+++ b/commands/helpers/build
@@ -3,6 +3,8 @@
 import common
 
 from devbot import build
+from devbot import system
 
 common.setup()
+system.check()
 build.build()
diff --git a/commands/helpers/build-snapshot b/commands/helpers/build-snapshot
index 84b1150..1dbf2eb 100755
--- a/commands/helpers/build-snapshot
+++ b/commands/helpers/build-snapshot
@@ -43,7 +43,6 @@ runsugarscript=$rootdir/run-sugar.sh
 cat > $runsugarscript << "EOF"
 #!/bin/sh
 
-commands/check-system
 commands/run
 EOF
 
@@ -54,7 +53,6 @@ runshellscript=$rootdir/run-shell.sh
 cat > $runshellscript << "EOF"
 #!/bin/sh
 
-commands/check-system
 commands/shell
 EOF
 
diff --git a/commands/run b/commands/run
index 2bc3a31..c71fe66 100755
--- a/commands/run
+++ b/commands/run
@@ -5,6 +5,8 @@ helpersdir=$commandsdir/helpers
 rootdir=`dirname "$commandsdir"`
 display=`$helpersdir/find-free-display`
 
+$commandsdir/check-system
+
 if [ -f $rootdir/prefs ]; then
     source $rootdir/prefs
 fi
diff --git a/devbot/system.py b/devbot/system.py
index 8e493cf..2a8d189 100644
--- a/devbot/system.py
+++ b/devbot/system.py
@@ -164,6 +164,8 @@ def remove_packages(package_manager, packages):
         package_manager.remove_packages(to_remove)
 
 def check(remove=False, update=False, test=False, interactive=True):
+    print "Checking the system"
+
     package_manager = \
         distro.get_package_manager(test=test, interactive=interactive)