chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4546929
)
build: delete bad builder/ symlinks
author
Hans-Christoph Steiner
<hans@eds.org>
Tue, 25 Apr 2017 08:27:09 +0000
(10:27 +0200)
committer
Hans-Christoph Steiner
<hans@eds.org>
Tue, 23 May 2017 18:06:06 +0000
(20:06 +0200)
If builder/ is a symlink but is not detected as a directory by
os.path.isdir(), then it is a broken symlink.
fdroidserver/build.py
patch
|
blob
|
history
diff --git
a/fdroidserver/build.py
b/fdroidserver/build.py
index ffc2700b04952b4896f95c6e6256b0bca4e033b6..c146b95f935c64c1b06332ae3fbb8e0e262842ad 100644
(file)
--- 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')