From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 25 Apr 2017 08:27:09 +0000 (+0200)
Subject: build: delete bad builder/ symlinks
X-Git-Tag: 0.8~56^2~5
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6106b962a2be1d401e2e476cd2260d7baf0ec177;p=fdroidserver.git

build: delete bad builder/ symlinks

If builder/ is a symlink but is not detected as a directory by
os.path.isdir(), then it is a broken symlink.
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index ffc2700b..c146b95f 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -226,6 +226,8 @@ def vm_test_ssh_into_builder():
 
 def vm_new_get_clean_builder(serverdir, reset=False):
     if not os.path.isdir(serverdir):
+        if os.path.islink(serverdir):
+            os.unlink(serverdir)
         logging.info("buildserver path does not exists, creating %s", serverdir)
         os.makedirs(serverdir)
     vagrantfile = os.path.join(serverdir, 'Vagrantfile')