From 24dd6740e11c566cd9fec364fd4c8380982d2804 Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Tue, 23 Feb 2021 21:42:41 +0100 Subject: [PATCH] Use tag if known This ensures that we actually use the tag someone created when a new tag is detected. --- fdroidserver/checkupdates.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py index f5d0d450..aa8f6ff8 100644 --- a/fdroidserver/checkupdates.py +++ b/fdroidserver/checkupdates.py @@ -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)