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

[checkupdates] Raise exception instead of returning an error

Browse source
This commit is contained in:
Jochen Sprickerhof 2021-07-27 22:02:36 +02:00
parent 6f7a1ecf01
commit ae98844943
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
fdroidserver/checkupdates.py
View file

@ -109,10 +109,10 @@ def check_tags(app, pattern):
repotype = app.RepoType repotype = app.RepoType
if repotype not in ('git', 'git-svn', 'hg', 'bzr'): if repotype not in ('git', 'git-svn', 'hg', 'bzr'):
return (None, 'Tags update mode only works for git, hg, bzr and git-svn repositories currently', None) raise MetaDataException(_('Tags update mode only works for git, hg, bzr and git-svn repositories currently'))
if repotype == 'git-svn' and ';' not in app.Repo: if repotype == 'git-svn' and ';' not in app.Repo:
return (None, 'Tags update mode used in git-svn, but the repo was not set up with tags', None) raise MetaDataException(_('Tags update mode used in git-svn, but the repo was not set up with tags'))
# Set up vcs interface and make sure we have the latest code... # Set up vcs interface and make sure we have the latest code...
vcs = common.getvcs(app.RepoType, app.Repo, build_dir) vcs = common.getvcs(app.RepoType, app.Repo, build_dir)
@ -133,14 +133,14 @@ def check_tags(app, pattern):
else: else:
tags = vcs.gettags() tags = vcs.gettags()
if not tags: if not tags:
return (None, "No tags found", None) raise FDroidException(_('No tags found'))
logging.debug("All tags: " + ','.join(tags)) logging.debug("All tags: " + ','.join(tags))
if pattern: if pattern:
pat = re.compile(pattern) pat = re.compile(pattern)
tags = [tag for tag in tags if pat.match(tag)] tags = [tag for tag in tags if pat.match(tag)]
if not tags: if not tags:
return (None, "No matching tags found", None) raise FDroidException(_('No matching tags found'))
logging.debug("Matching tags: " + ','.join(tags)) logging.debug("Matching tags: " + ','.join(tags))
if len(tags) > 5 and repotype == 'git': if len(tags) > 5 and repotype == 'git':
@ -218,7 +218,7 @@ def check_tags(app, pattern):
except VCSException: except VCSException:
pass pass
return (hver, hcode, htag) return (hver, hcode, htag)
return (None, "Couldn't find any version information", None) raise FDroidException(_("Couldn't find any version information"))
def check_repomanifest(app, branch=None): def check_repomanifest(app, branch=None):
@ -272,10 +272,10 @@ def check_repomanifest(app, branch=None):
hver = version hver = version
if not hpak: if not hpak:
return (None, "Couldn't find package ID") raise FDroidException(_("Couldn't find package ID"))
if hver: if hver:
return (hver, hcode) return (hver, hcode)
return (None, "Couldn't find any version information") raise FDroidException(_("Couldn't find any version information"))
def check_repotrunk(app): def check_repotrunk(app):
@ -287,7 +287,7 @@ def check_repotrunk(app):
repotype = app.RepoType repotype = app.RepoType
if repotype not in ('git-svn', ): if repotype not in ('git-svn', ):
return (None, 'RepoTrunk update mode only makes sense in git-svn repositories') raise MetaDataException(_('RepoTrunk update mode only makes sense in git-svn repositories'))
# Set up vcs interface and make sure we have the latest code... # Set up vcs interface and make sure we have the latest code...
vcs = common.getvcs(app.RepoType, app.Repo, build_dir) vcs = common.getvcs(app.RepoType, app.Repo, build_dir)