mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-16 16:02:33 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

vcs_* stuff should not raise BuildExceptions

Browse source
This commit is contained in:
Daniel Martí 2014-07-03 13:53:54 +02:00
parent ee99d55e30
commit d9d5f30d7b
2 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
fdroidserver/checkupdates.py
View file

@ -32,7 +32,7 @@ import logging
import common import common
import metadata import metadata
from common import BuildException, VCSException from common import VCSException
from metadata import MetaDataException from metadata import MetaDataException
@ -156,9 +156,6 @@ def check_tags(app, pattern):
return (hver, hcode, htag) return (hver, hcode, htag)
return (None, "Couldn't find any version information", None) return (None, "Couldn't find any version information", None)
except BuildException as be:
msg = "Could not scan app {0} due to BuildException: {1}".format(app['id'], be)
return (None, msg, None)
except VCSException as vcse: except VCSException as vcse:
msg = "VCS error while scanning app {0}: {1}".format(app['id'], vcse) msg = "VCS error while scanning app {0}: {1}".format(app['id'], vcse)
return (None, msg, None) return (None, msg, None)
@ -235,9 +232,6 @@ def check_repomanifest(app, branch=None):
return (version, vercode) return (version, vercode)
except BuildException as be:
msg = "Could not scan app {0} due to BuildException: {1}".format(app['id'], be)
return (None, msg)
except VCSException as vcse: except VCSException as vcse:
msg = "VCS error while scanning app {0}: {1}".format(app['id'], vcse) msg = "VCS error while scanning app {0}: {1}".format(app['id'], vcse)
return (None, msg) return (None, msg)
@ -266,9 +260,6 @@ def check_repotrunk(app, branch=None):
ref = vcs.getref() ref = vcs.getref()
return (ref, ref) return (ref, ref)
except BuildException as be:
msg = "Could not scan app {0} due to BuildException: {1}".format(app['id'], be)
return (None, msg)
except VCSException as vcse: except VCSException as vcse:
msg = "VCS error while scanning app {0}: {1}".format(app['id'], vcse) msg = "VCS error while scanning app {0}: {1}".format(app['id'], vcse)
return (None, msg) return (None, msg)

4
fdroidserver/common.py
View file

@ -1021,7 +1021,7 @@ def getsrclib(spec, srclib_dir, srclibpaths=[], subdir=None,
name, subdir = name.split('/', 1) name, subdir = name.split('/', 1)
if name not in metadata.srclibs: if name not in metadata.srclibs:
raise BuildException('srclib ' + name + ' not found.') raise VCSException('srclib ' + name + ' not found.')
srclib = metadata.srclibs[name] srclib = metadata.srclibs[name]
@ -1058,7 +1058,7 @@ def getsrclib(spec, srclib_dir, srclibpaths=[], subdir=None,
s_tuple = t s_tuple = t
break break
if s_tuple is None: if s_tuple is None:
raise BuildException('Missing recursive srclib %s for %s' % ( raise VCSException('Missing recursive srclib %s for %s' % (
lib, name)) lib, name))
place_srclib(libdir, n, s_tuple[2]) place_srclib(libdir, n, s_tuple[2])
n += 1 n += 1