From d9d5f30d7bb521d9ec8d81fa839d63af8a63aeb2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Thu, 3 Jul 2014 13:53:54 +0200 Subject: [PATCH] vcs_* stuff should not raise BuildExceptions --- fdroidserver/checkupdates.py | 11 +---------- fdroidserver/common.py | 4 ++-- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py index 292a495e..a292c7bd 100644 --- a/fdroidserver/checkupdates.py +++ b/fdroidserver/checkupdates.py @@ -32,7 +32,7 @@ import logging import common import metadata -from common import BuildException, VCSException +from common import VCSException from metadata import MetaDataException @@ -156,9 +156,6 @@ def check_tags(app, pattern): return (hver, hcode, htag) 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: msg = "VCS error while scanning app {0}: {1}".format(app['id'], vcse) return (None, msg, None) @@ -235,9 +232,6 @@ def check_repomanifest(app, branch=None): 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: msg = "VCS error while scanning app {0}: {1}".format(app['id'], vcse) return (None, msg) @@ -266,9 +260,6 @@ def check_repotrunk(app, branch=None): ref = vcs.getref() 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: msg = "VCS error while scanning app {0}: {1}".format(app['id'], vcse) return (None, msg) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index a26716ae..1b6631b3 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1021,7 +1021,7 @@ def getsrclib(spec, srclib_dir, srclibpaths=[], subdir=None, name, subdir = name.split('/', 1) if name not in metadata.srclibs: - raise BuildException('srclib ' + name + ' not found.') + raise VCSException('srclib ' + name + ' not found.') srclib = metadata.srclibs[name] @@ -1058,7 +1058,7 @@ def getsrclib(spec, srclib_dir, srclibpaths=[], subdir=None, s_tuple = t break if s_tuple is None: - raise BuildException('Missing recursive srclib %s for %s' % ( + raise VCSException('Missing recursive srclib %s for %s' % ( lib, name)) place_srclib(libdir, n, s_tuple[2]) n += 1 -- 2.30.2