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

Merge branch 'fix_check_tags' into 'master'

Browse source 
[checkupdates] handle non matching regex

See merge request fdroid/fdroidserver!943
This commit is contained in:
Jochen Sprickerhof 2021-06-07 16:12:19 +00:00
commit b6233fa2ce
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
fdroidserver/checkupdates.py
View file

@ -166,9 +166,8 @@ def check_tags(app, pattern):
filecontent = (build_dir / filecode).read_text() filecontent = (build_dir / filecode).read_text()
m = re.search(codeex, filecontent) m = re.search(codeex, filecontent)
if not m: if m:
raise FDroidException("No RE match for version code") vercode = m.group(1).strip()
vercode = m.group(1).strip()
version = "??" version = "??"
if filever: if filever:
@ -176,9 +175,8 @@ def check_tags(app, pattern):
filecontent = (build_dir / filever).read_text() filecontent = (build_dir / filever).read_text()
m = re.search(verex, filecontent) m = re.search(verex, filecontent)
if not m: if m:
raise FDroidException("No RE match for version") version = m.group(1)
version = m.group(1)
if vercode: if vercode:
logging.debug("UpdateCheckData found version {0} ({1})" logging.debug("UpdateCheckData found version {0} ({1})"