kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-09-11 23:23:27 +02:00
Code Activity

Fix default update= on ant builds

Browse Source
This commit is contained in:
Daniel Martí 2015-12-02 20:16:25 +01:00
parent bf8518ee8f
commit a566ee4475
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdroidserver/common.py
View File

@ -1455,7 +1455,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
(app.id, build.version), p.output) (app.id, build.version), p.output)
# Generate (or update) the ant build file, build.xml... # 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'] parms = ['android', 'update', 'lib-project']
lparms = ['android', 'update', 'project'] lparms = ['android', 'update', 'project']

2
fdroidserver/metadata.py
View File

@ -312,7 +312,7 @@ class Build():
for f in ['maven', 'gradle', 'kivy']: for f in ['maven', 'gradle', 'kivy']:
if self.get_flag(f): if self.get_flag(f):
return f return f
if build.output: if self.output:
return 'raw' return 'raw'
return 'ant' return 'ant'