From: Daniel Martí <mvdan@mvdan.cc>
Date: Tue, 31 Mar 2015 21:08:32 +0000 (+0200)
Subject: Fix buildTools versions that reference variables
X-Git-Tag: 0.4.0~102
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=85b48a5c25c1de22715118509ee1d33a75c2a831;p=fdroidserver.git

Fix buildTools versions that reference variables
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 02faf38e..e04ffffd 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -428,13 +428,14 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
 
 
 def adapt_gradle(build_dir):
+    filename = 'build.gradle'
     for root, dirs, files in os.walk(build_dir):
-        if 'build.gradle' in files:
-            path = os.path.join(root, 'build.gradle')
-            logging.debug("Adapting build.gradle at %s" % path)
+        if filename in files:
+            path = os.path.join(root, filename)
+            logging.debug("Adapting %s at %s" % (filename, path))
 
             FDroidPopen(['sed', '-i',
-                         r's@buildToolsVersion\([ =]*\)["\'][0-9\.]*["\']@buildToolsVersion\1"'
+                         r's@buildToolsVersion\([ =]\+\).*@buildToolsVersion\1"'
                          + config['build_tools'] + '"@g', path])