From 85b48a5c25c1de22715118509ee1d33a75c2a831 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Tue, 31 Mar 2015 23:08:32 +0200 Subject: [PATCH] Fix buildTools versions that reference variables --- fdroidserver/build.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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]) -- 2.30.2