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

Don't use 'yes' as flavour

Browse source
This commit is contained in:
Daniel Martí 2014-03-21 19:10:50 +01:00
parent c63fef2af3
commit 758f88af7b
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
fdroidserver/checkupdates.py
View file

@ -111,6 +111,8 @@ def check_tags(app, pattern):
build_dir = os.path.join(build_dir, app['builds'][-1]['subdir']) build_dir = os.path.join(build_dir, app['builds'][-1]['subdir'])
if 'gradle' in app['builds'][-1]: if 'gradle' in app['builds'][-1]:
flavour = app['builds'][-1]['gradle'] flavour = app['builds'][-1]['gradle']
if flavour == 'yes':
flavour = None
htag = None htag = None
hver = None hver = None
@ -193,6 +195,8 @@ def check_repomanifest(app, branch=None):
build_dir = os.path.join(build_dir, app['builds'][-1]['subdir']) build_dir = os.path.join(build_dir, app['builds'][-1]['subdir'])
if 'gradle' in app['builds'][-1]: if 'gradle' in app['builds'][-1]:
flavour = app['builds'][-1]['gradle'] flavour = app['builds'][-1]['gradle']
if flavour == 'yes':
flavour = None
if not os.path.isdir(build_dir): if not os.path.isdir(build_dir):
return (None, "Subdir '" + app['builds'][-1]['subdir'] + "'is not a valid directory") return (None, "Subdir '" + app['builds'][-1]['subdir'] + "'is not a valid directory")
@ -416,9 +420,11 @@ def main():
app_dir = os.path.join(app_dir, app['builds'][-1]['subdir']) app_dir = os.path.join(app_dir, app['builds'][-1]['subdir'])
if 'gradle' in app['builds'][-1]: if 'gradle' in app['builds'][-1]:
flavour = app['builds'][-1]['gradle'] flavour = app['builds'][-1]['gradle']
if flavour == 'yes':
flavour = None
logging.debug("...fetch auto name from " + app_dir + logging.debug("...fetch auto name from " + app_dir +
((" (flavour:" + flavour) if flavour else "")) ((" (flavour: %s)" % flavour) if flavour else ""))
new_name = common.fetch_real_name(app_dir, flavour) new_name = common.fetch_real_name(app_dir, flavour)
if new_name: if new_name:
logging.debug("...got autoname '" + new_name + "'") logging.debug("...got autoname '" + new_name + "'")