mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-06 15:30:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use ordered dicts for defaults in apps and builds

Browse source
This commit is contained in:
Daniel Martí 2014-05-31 23:10:16 +02:00
parent c125ab9b7f
commit 3d72c30fe5
7 changed files with 141 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

17
fdroidserver/checkupdates.py
View file

@ -109,9 +109,9 @@ def check_tags(app, pattern):
flavour = None
if len(app['builds']) > 0:
if 'subdir' in app['builds'][-1]:
if app['builds'][-1]['subdir']:
build_dir = os.path.join(build_dir, app['builds'][-1]['subdir'])
if 'gradle' in app['builds'][-1]:
if app['builds'][-1]['gradle']:
flavour = app['builds'][-1]['gradle']
if flavour == 'yes':
flavour = None
@ -198,9 +198,9 @@ def check_repomanifest(app, branch=None):
flavour = None
if len(app['builds']) > 0:
if 'subdir' in app['builds'][-1]:
if app['builds'][-1]['subdir']:
build_dir = os.path.join(build_dir, app['builds'][-1]['subdir'])
if 'gradle' in app['builds'][-1]:
if app['builds'][-1]['gradle']:
flavour = app['builds'][-1]['gradle']
if flavour == 'yes':
flavour = None
@ -434,9 +434,9 @@ def main():
flavour = None
if len(app['builds']) > 0:
if 'subdir' in app['builds'][-1]:
if app['builds'][-1]['subdir']:
app_dir = os.path.join(app_dir, app['builds'][-1]['subdir'])
if 'gradle' in app['builds'][-1]:
if app['builds'][-1]['gradle']:
flavour = app['builds'][-1]['gradle']
if flavour == 'yes':
flavour = None
@ -491,9 +491,8 @@ def main():
if not gotcur:
newbuild = latest.copy()
for k in ('origlines', 'disable'):
if k in newbuild:
del newbuild[k]
del newbuild['origlines']
newbuild['disable'] = False
newbuild['vercode'] = app['Current Version Code']
newbuild['version'] = app['Current Version'] + suffix
logging.info("...auto-generating build for " + newbuild['version'])