chiark / gitweb /
Fix build-tools patching when it uses variables
authorDaniel Martí <mvdan@mvdan.cc>
Wed, 14 Oct 2015 17:34:30 +0000 (19:34 +0200)
committerDaniel Martí <mvdan@mvdan.cc>
Wed, 14 Oct 2015 17:34:30 +0000 (19:34 +0200)
Like:

buildToolsVersion FOO_VERSION

fdroidserver/build.py

index aafc956ad2ced7d31c5291c538ab956076327760..ace906c2d7afa4e49bde2b6f1c806b70c590bd5e 100644 (file)
@@ -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)