From a566ee4475b9fa74fc81756a92257fb4018e3c93 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Wed, 2 Dec 2015 20:16:25 +0100 Subject: [PATCH] Fix default update= on ant builds --- fdroidserver/common.py | 2 +- fdroidserver/metadata.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index f20b0b5f..5e04f362 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1455,7 +1455,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver= (app.id, build.version), p.output) # Generate (or update) the ant build file, build.xml... - if build.update and build.update != ['no'] and build.method() == 'ant': + if build.method() == 'ant' and build.update != ['no']: parms = ['android', 'update', 'lib-project'] lparms = ['android', 'update', 'project'] diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index a06d1905..d1aab68a 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -312,7 +312,7 @@ class Build(): for f in ['maven', 'gradle', 'kivy']: if self.get_flag(f): return f - if build.output: + if self.output: return 'raw' return 'ant' -- 2.30.2