reset buildserver vm if vagrant uuid not present

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 06b93529a70fa0dedded495aca6c3234e58a6c42..80af320cd58c81f7b29c44747f50f8bf15f3ba74 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -242,8 +242,11 @@ 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.vagrant_uuid_okay():
+        logging.info('resetting buildserver, bceause vagrant vm is not okay.')
+        reset = True
     elif not vm.snapshot_exists('fdroidclean'):
-        logging.info("resetting buildserver, because snapshot 'fdroidclean' is not present")
+        logging.info("resetting buildserver, because snapshot 'fdroidclean' is not present.")
         reset = True
 
     if reset:

diff --git a/fdroidserver/vmtools.py b/fdroidserver/vmtools.py
index a47b4c9ee69316552c2d2f62916c09f372250bc6..ec28ed48c9587a076c55b611b42707311ec5c789 100644 (file)
--- a/fdroidserver/vmtools.py
+++ b/fdroidserver/vmtools.py
@@ -184,6 +184,12 @@ class FDroidBuildVm():
     def package(self, output=None, vagrantfile=None, keep_box_file=None):
         self.vgrnt.package(output=output, vagrantfile=vagrantfile)
 
+    def vagrant_uuid_okay(self):
+        '''Having an uuid means that vagrant up has run successfully.'''
+        if self.srvuuid is None:
+            return False
+        return True
+
     def _vagrant_file_name(self, name):
         return name.replace('/', '-VAGRANTSLASH-')