From: Daniel Martí <mvdan@mvdan.cc>
Date: Wed, 14 Oct 2015 17:34:30 +0000 (+0200)
Subject: Fix build-tools patching when it uses variables
X-Git-Tag: 0.5.0~43
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d706cfa7d8a86600896960b4d9ef804d4a4bcf7a;p=fdroidserver.git

Fix build-tools patching when it uses variables

Like:

	buildToolsVersion FOO_VERSION
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index aafc956a..ace906c2 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -442,7 +442,7 @@ def adapt_gradle(build_dir):
             if not os.path.isfile(path):
                 continue
             logging.debug("Adapting %s at %s" % (filename, path))
-            common.regsub_file(r"""(\s*)buildToolsVersion([\s=]+)['"].*""",
+            common.regsub_file(r"""(\s*)buildToolsVersion([\s=]+).*""",
                                r"""\1buildToolsVersion\2'%s'""" % config['build_tools'],
                                path)