mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-19 03:30:12 +02:00
Merge branch 'fix_check_tags' into 'master'
[checkupdates] handle non matching regex See merge request fdroid/fdroidserver!943
This commit is contained in:
commit
b6233fa2ce
@ -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})"
|
||||||
|
Loading…
Reference in New Issue
Block a user