Try to get steps ordering right

2 files changed, 9 insertions, 7 deletions

diff --git a/devbot/build.py b/devbot/build.py
index 95652b5..c1a1756 100644
--- a/devbot/build.py
+++ b/devbot/build.py
@@ -53,8 +53,8 @@ def pull(lazy=False):
 
 def build(full=False):
     if full or state.full_build_is_required():
-        state.clean(build_only=True)
-        clean()
+        from devbot import clean
+        clean.clean(build_only=True)
 
     state.full_build_touch()
 
@@ -95,8 +95,6 @@ def distribute():
 
 
 def clean():
-    print "\n= Clean =\n"
-
     print "* Emptying install directory"
     _empty_dir(config.install_dir)
 
diff --git a/devbot/clean.py b/devbot/clean.py
index 7601382..8d0c7a0 100644
--- a/devbot/clean.py
+++ b/devbot/clean.py
@@ -3,7 +3,11 @@ from devbot import logs
 from devbot import state
 
 
-def clean():
+def clean(build_only=False):
+    print "\n= Clean =\n"
+
     build.clean()
-    logs.clean()
-    state.clean()
+    state.clean(build_only=build_only)
+
+    if not build_only:
+        logs.clean()