1berry/fdroidserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'version_unknown' into 'master'

Browse Source 
[checkupdates] Use tag if version is 'Unknown'

See merge request fdroid/fdroidserver!970
This commit is contained in:
Jochen Sprickerhof 2021-06-20 08:41:58 +00:00
commit 958fd17232
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdroidserver/checkupdates.py
View File

@ -207,6 +207,8 @@ def check_tags(app, pattern):
root_dir = build_dir / subdir root_dir = build_dir / subdir
paths = common.manifest_paths(root_dir, last_build.gradle) paths = common.manifest_paths(root_dir, last_build.gradle)
version, vercode, _package = common.parse_androidmanifests(paths, app) version, vercode, _package = common.parse_androidmanifests(paths, app)
if version == 'Unknown' or version == 'Ignore':
version = tag
if vercode: if vercode:
logging.debug("Manifest exists in subdir '{0}'. Found version {1} ({2})" logging.debug("Manifest exists in subdir '{0}'. Found version {1} ({2})"
.format(subdir, version, vercode)) .format(subdir, version, vercode))
@ -463,8 +465,6 @@ def checkupdates_app(app):
if mode.startswith('Tags'): if mode.startswith('Tags'):
pattern = mode[5:] if len(mode) > 4 else None pattern = mode[5:] if len(mode) > 4 else None
(version, vercode, tag) = check_tags(app, pattern) (version, vercode, tag) = check_tags(app, pattern)
if version == 'Unknown':
version = tag
msg = vercode msg = vercode
elif mode == 'RepoManifest': elif mode == 'RepoManifest':
(version, vercode) = check_repomanifest(app) (version, vercode) = check_repomanifest(app)