Merge branch 'checkupdates' into 'master'

checkupdates: skip when there is no match for version

See merge request fdroid/fdroidserver!1321
This commit is contained in:
Jochen Sprickerhof 2023-03-20 14:43:41 +00:00
commit b5ec531e72

View file

@ -159,6 +159,8 @@ def check_tags(app, pattern):
if codeex: if codeex:
m = re.search(codeex, filecontent) m = re.search(codeex, filecontent)
if not m: if not m:
logging.debug(f"UpdateCheckData regex {codeex} for version code"
f" has no match in tag {tag}")
continue continue
vercode = m.group(1).strip() vercode = m.group(1).strip()
@ -176,8 +178,12 @@ def check_tags(app, pattern):
version = tag version = tag
if verex: if verex:
m = re.search(verex, filecontent) m = re.search(verex, filecontent)
if m: if not m:
version = m.group(1) logging.debug(f"UpdateCheckData regex {verex} for version name"
f" has no match in tag {tag}")
continue
version = m.group(1)
logging.debug("UpdateCheckData found version {0} ({1})" logging.debug("UpdateCheckData found version {0} ({1})"
.format(version, vercode)) .format(version, vercode))