opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release_17.01' into release_17.05

Browse Source
This commit is contained in:
mvdbeek
2017-08-17 20:18:56 +02:00
parent 7f78ee7b18 748539a3a6
commit 685b9de09b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/deps/installable.py
+2 -2
View File
@@ -69,9 +69,9 @@ def ensure_installed(installable_context, install_func, auto_init):
try:
if auto_init and os.access(parent_path, os.W_OK):
with FileLock(os.path.join(parent_path, desc.lower())):
with FileLock(os.path.join(parent_path, desc.lower()), timeout=300):
return _check()
else:
return _check()
except FileLockException:
return ensure_installed(installable_context, auto_init)
raise Exception("Failed to get file lock for %s" % os.path.join(parent_path, desc.lower()))