From: Daniel Martí <mvdan@mvdan.cc>
Date: Fri, 19 Apr 2013 20:32:27 +0000 (+0200)
Subject: Less redundancy in maven cmds
X-Git-Tag: 0.1~640
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=59cb32f308c433b044f09e5d52651aa6dbcdc261;p=fdroidserver.git

Less redundancy in maven cmds
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 1d5bc7a1..f505171b 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -338,10 +338,11 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, extlib_dir, tmp_dir,
 
     # Build the release...
     if 'maven' in thisbuild:
+        mvncmd = [mvn3, 'clean', 'package', '-Dandroid.sdk.path=' + sdk_path]
         if install:
-            mvncmd = [mvn3, 'clean', 'package', '-Dandroid.sdk.path=' + sdk_path, '-Dandroid.sign.debug=true']
+            mvncmd.append('-Dandroid.sign.debug=true')
         else:
-            mvncmd = [mvn3, 'clean', 'package', '-Dandroid.sdk.path=' + sdk_path, '-Dandroid.release=true']
+            mvncmd.append('-Dandroid.release=true')
         if 'mvnflags' in thisbuild:
             mvncmd += thisbuild['mvnflags']
         p = subprocess.Popen(mvncmd, cwd=root_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)