From 6c64632f483dda09277651b54f9a175d7e8f890d Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Tue, 4 Jun 2013 22:41:39 +0100 Subject: [PATCH] Handle half-built and abandoned vms better --- fdroidserver/build.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index f6efa6d7..974c2b4e 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -49,8 +49,9 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, sdk_path, force): vm_ok = False if not options.resetserver: print "Checking for valid existing build server" - if os.path.exists(os.path.join('builder', 'Vagrantfile')): - print "...directory exists" + if (os.path.exists(os.path.join('builder', 'Vagrantfile')) and + os.path.exists(os.path.join('builder', '.vagrant'))): + print "...VM is present" p = subprocess.Popen(['VBoxManage', 'snapshot', get_builder_vm_id(), 'list', '--details'], cwd='builder', stdout=subprocess.PIPE) output = p.communicate()[0]