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

AutoUpdateMode: Do not include + in suffix

Browse source 
Add suffix to version only
This commit is contained in:
Gerhard Olsson 2020-01-02 13:27:12 +00:00 • committed by Hans-Christoph Steiner
parent 619ccb8d5a
commit cf9bff1d56
2 changed files with 57 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
fdroidserver/checkupdates.py
View file

@ -485,13 +485,13 @@ def checkupdates_app(app):
pass
elif mode.startswith('Version '):
pattern = mode[8:]
suffix = ''
if pattern.startswith('+'):
try:
suffix, pattern = pattern.split(' ', 1)
suffix, pattern = pattern[1:].split(' ', 1)
except ValueError:
raise MetaDataException("Invalid AUM: " + mode)
else:
suffix = ''
gotcur = False
latest = None
for build in app.builds:
@ -507,9 +507,9 @@ def checkupdates_app(app):
newbuild = copy.deepcopy(latest)
newbuild.disable = False
newbuild.versionCode = app.CurrentVersionCode
newbuild.versionName = app.CurrentVersion + suffix
newbuild.versionName = app.CurrentVersion + suffix.replace('%c', newbuild.versionCode)
logging.info("...auto-generating build for " + newbuild.versionName)
commit = pattern.replace('%v', newbuild.versionName)
commit = pattern.replace('%v', app.CurrentVersion)
commit = commit.replace('%c', newbuild.versionCode)
newbuild.commit = commit
app.builds.append(newbuild)