From: Daniel Martí <mvdan@mvdan.cc>
Date: Thu, 10 Oct 2013 15:52:17 +0000 (+0200)
Subject: Forgot to execute cleaning process
X-Git-Tag: 0.1~361
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1cf99754a40e75014d5bccf7a15555496f160b3a;p=fdroidserver.git

Forgot to execute cleaning process
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 39e233e4..62c5d24d 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -352,6 +352,8 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
     # We need to clean via the build tool in case the binary dirs are
     # different from the default ones
     p = None
+    output = ''
+    error = ''
     if 'maven' in thisbuild:
         print "Cleaning Maven project..."
         cmd = [mvn3, 'clean', '-Dandroid.sdk.path=' + sdk_path]
@@ -390,6 +392,11 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
         else:
             error += line
 
+    p.communicate()
+    if p.returncode != 0:
+        raise BuildException("Error cleaning %s:%s" %
+                (app['id'], thisbuild['version']), output, error)
+
     # Also clean jni
     print "Cleaning jni dirs..."
     for baddir in [