From d5859fab3212763b56df372a55930574cf7010df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 28 Jan 2014 14:14:18 +0100 Subject: [PATCH] Fix a couple gradle python mistakes --- fdroidserver/common.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index fd2e1abc..3bca96d3 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1013,12 +1013,14 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver= if flavour in ['main', 'yes', '']: flavour = None - if 'target' in thisbuild: - n = thisbuild["target"].split('-')[1] + if 'target' in build: + n = build["target"].split('-')[1] subprocess.call(['sed', '-i', 's@compileSdkVersion[ ]*[0-9]*@compileSdkVersion '+n+'@g', 'build.gradle'], cwd=root_dir) - if '@' in thisbuild['gradle']: + if '@' in build['gradle']: + gradle_dir = os.path.join(root_dir, build['gradle'].split('@',1)[1]) + gradle_dir = os.path.normpath(gradle_dir) subprocess.call(['sed', '-i', 's@compileSdkVersion[ ]*[0-9]*@compileSdkVersion '+n+'@g', 'build.gradle'], cwd=gradle_dir)