Merge branch 'fix/checkupdateCommit' into 'master'

Use tag if known

See merge request fdroid/fdroidserver!872
This commit is contained in:
Hans-Christoph Steiner 2021-04-07 09:53:42 +00:00
commit 380f3b2e9f

View file

@ -518,9 +518,13 @@ def checkupdates_app(app):
newbuild.versionCode = app.CurrentVersionCode
newbuild.versionName = app.CurrentVersion + suffix.replace('%c', newbuild.versionCode)
logging.info("...auto-generating build for " + newbuild.versionName)
commit = pattern.replace('%v', app.CurrentVersion)
commit = commit.replace('%c', newbuild.versionCode)
newbuild.commit = commit
if tag:
newbuild.commit = tag
else:
commit = pattern.replace('%v', app.CurrentVersion)
commit = commit.replace('%c', newbuild.versionCode)
newbuild.commit = commit
app['Builds'].append(newbuild)
name = _getappname(app)
ver = _getcvname(app)