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

removed useless vm validity check; attempted to fix vbox support

Browse source
This commit is contained in:
Michael Pöhn 2017-04-12 17:07:50 +02:00 • committed by Hans-Christoph Steiner
parent 1b1d6b7d96
commit 358b00d7aa
2 changed files with 46 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

5
fdroidserver/build.py
View file

@ -242,9 +242,6 @@ def vm_new_get_clean_builder(serverdir, reset=False):
vm = vmtools.get_build_vm(serverdir)
if reset:
logging.info('resetting buildserver by request')
elif not vm.check_okay():
logging.info('resetting buildserver because it appears to be absent or broken')
reset = True
elif not vm.snapshot_exists('fdroidclean'):
logging.info("resetting buildserver, because snapshot 'fdroidclean' is not present")
reset = True
@ -259,7 +256,7 @@ def vm_new_get_clean_builder(serverdir, reset=False):
vm.snapshot_create('fdroidclean')
else:
logging.info('builserver ok: reverting to clean snapshot')
vm.snapshot_revert('droidclean')
vm.snapshot_revert('fdroidclean')
vm.up()
return get_vagrant_sshinfo()