From 7859244ce7c47755e0f4ed77e171f69a6e24e000 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Fri, 20 Oct 2017 04:38:39 +0200 Subject: [PATCH] makebuildserver: remove reference to f-droid.org/jessie64.box Also improve error message when the initial vagrant up fails, this is most likely due to the missing jessie64.box file. --- makebuildserver | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/makebuildserver b/makebuildserver index e899100d..27a952b8 100755 --- a/makebuildserver +++ b/makebuildserver @@ -58,8 +58,7 @@ logger.debug('cachedir set to: %s', cachedir) config = { 'basebox': 'jessie64', 'baseboxurl': [ - pathlib.Path(os.path.join(cachedir, 'jessie64.box')).as_uri(), - 'https://f-droid.org/jessie64.box', + pathlib.Path(os.path.join(cachedir, 'jessie64.box')).as_uri() ], 'debian_mirror': 'http://http.debian.net/debian/', 'apt_package_cache': False, @@ -525,9 +524,9 @@ def main(): debug_log_vagrant_vm(serverdir, config) try: v.up(provision=True) - except fdroidserver.vmtools.FDroidBuildVmException as e: + except subprocess.CalledProcessError: debug_log_vagrant_vm(serverdir, config) - logger.exception('could not bring buildserver vm up. %s', e) + logger.error("'vagrant up' failed, is the base box missing?") sys.exit(1) if config['copy_caches_from_host']: -- 2.30.2