From 943c2b64bf0068b73229b9e236867d7d2b944a94 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Sun, 30 May 2021 11:12:42 +0200 Subject: [PATCH] Support AutoUpdateMode: Version without pattern Since 24dd6740 UpdateCheckMode: Tags uses the found tag instead of regenerating it from the AutoUpdateMode pattern making the pattern superfluous. This adds support for dropping the pattern and a test case. --- fdroidserver/checkupdates.py | 2 +- fdroidserver/metadata.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py index f5d0d450..b9e723df 100644 --- a/fdroidserver/checkupdates.py +++ b/fdroidserver/checkupdates.py @@ -492,7 +492,7 @@ def checkupdates_app(app): logging.warning("Can't auto-update app with no CurrentVersionCode: " + app.id) elif mode in ('None', 'Static'): pass - elif mode.startswith('Version '): + elif mode.startswith('Version'): pattern = mode[8:] suffix = '' if pattern.startswith('+'): diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 2d719c8a..8b27c991 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -448,7 +448,7 @@ valuetypes = { ["AntiFeatures"]), FieldValidator("Auto Update Mode", - r"^(Version .+|None)$", + r"^(Version.*|None)$", ["AutoUpdateMode"]), FieldValidator("Update Check Mode",