From 2cbde77798374eb93d158dc43265ce146940caa0 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 13 Nov 2019 11:58:55 +0100 Subject: [PATCH] build: do not crash if SVN URL pre-validation fails; log error This is the problem: https://jenkins.debian.net/job/reproducible_fdroid_build_apps/704/console --- fdroidserver/common.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 9fa6072d..033aaebf 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1034,9 +1034,12 @@ class vcs_gitsvn(vcs): raise VCSException(_('HTTPS must be used with Subversion URLs!')) # git-svn sucks at certificate validation, this throws useful errors: - import requests - r = requests.head(remote) - r.raise_for_status() + try: + import requests + r = requests.head(remote) + r.raise_for_status() + except Exception as e: + raise VCSException('SVN certificate pre-validation failed: ' + str(e)) location = r.headers.get('location') if location and not location.startswith('https://'): raise VCSException(_('Invalid redirect to non-HTTPS: {before} -> {after} ')