kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-06 11:00:13 +02:00
Code Activity

Merge branch 'remove_basebox_ref' into 'master'

Browse Source 
makebuildserver: remove reference to f-droid.org/jessie64.box

See merge request fdroid/fdroidserver!357
This commit is contained in:
Hans-Christoph Steiner 2017-10-20 19:54:50 +00:00
commit 55a24dc408
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
makebuildserver
View File

@ -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']: