1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-09-17 18:50:11 +02:00

Only set Auto Name if one isn't set already

This commit is contained in:
Ciaran Gultnieks 2015-01-12 18:58:03 +00:00
parent dffaaccbc4
commit 5b868c8a4c

View File

@ -2,7 +2,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# checkupdates.py - part of the FDroid server tools # checkupdates.py - part of the FDroid server tools
# Copyright (C) 2010-13, Ciaran Gultnieks, ciaran@ciarang.com # Copyright (C) 2010-2015, Ciaran Gultnieks, ciaran@ciarang.com
# Copyright (C) 2013-2014 Daniel Martí <mvdan@mvdan.cc> # Copyright (C) 2013-2014 Daniel Martí <mvdan@mvdan.cc>
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
@ -353,17 +353,17 @@ def fetch_autoname(app, tag):
if app['builds'][-1]['gradle']: if app['builds'][-1]['gradle']:
flavours = app['builds'][-1]['gradle'] flavours = app['builds'][-1]['gradle']
logging.debug("...fetch auto name from " + app_dir) if not app['Auto Name']:
new_name = common.fetch_real_name(app_dir, flavours) logging.debug("...fetch auto name from " + app_dir)
commitmsg = None new_name = common.fetch_real_name(app_dir, flavours)
if new_name: commitmsg = None
logging.debug("...got autoname '" + new_name + "'") if new_name:
if new_name != app['Auto Name']: logging.debug("...got autoname '" + new_name + "'")
app['Auto Name'] = new_name app['Auto Name'] = new_name
if not commitmsg: if not commitmsg:
commitmsg = "Set autoname of {0}".format(common.getappname(app)) commitmsg = "Set autoname of {0}".format(common.getappname(app))
else: else:
logging.debug("...couldn't get autoname") logging.debug("...couldn't get autoname")
if app['Current Version'].startswith('@string/'): if app['Current Version'].startswith('@string/'):
cv = common.version_name(app['Current Version'], app_dir, flavours) cv = common.version_name(app['Current Version'], app_dir, flavours)