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

UpdateCheckIgnore: Exception if version not matched

Browse source 
Ignoreversions were checked also if version did not match which raised the exception
The 'version check' runs in some unexpected situations like just
to find directories where to find the AutoName.
This commit is contained in:
Gerhard Olsson 2019-07-23 00:21:28 +02:00
parent 1ccd839a77
commit 7c4bed0558
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
fdroidserver/checkupdates.py
View file

@ -43,6 +43,9 @@ from .exception import VCSException, NoSubmodulesException, FDroidException, Met
# required.
def check_http(app):
ignoreversions = app.UpdateCheckIgnore
ignoresearch = re.compile(ignoreversions).search if ignoreversions else None
try:
if not app.UpdateCheckData:
@ -82,8 +85,9 @@ def check_http(app):
raise FDroidException("No RE match for version")
version = m.group(1)
return (version, vercode)
if version and ignoresearch and not ignoresearch(version):
return (version, vercode)
return (None, ("Version {version} is ignored").format(version=version))
except FDroidException:
msg = "Could not complete http check for app {0} due to unknown error: {1}".format(app.id, traceback.format_exc())
return (None, msg)