opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-25 00:12:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

ensure_installed is now iterative instead of recursive

Browse Source
This commit is contained in:
Matthias Bernt
2017-08-17 20:02:36 +02:00
committed by mvdbeek
parent 1e1c549e69
commit a1b8a54ef8
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/deps/installable.py
+12 -7
View File
@@ -67,11 +67,16 @@ def ensure_installed(installable_context, install_func, auto_init):
if not os.path.lexists(parent_path):
os.mkdir(parent_path)
try:
if auto_init and os.access(parent_path, os.W_OK):
with FileLock(os.path.join(parent_path, desc.lower())):
import time
MAX_TRIES = 10
for i in range( MAX_TRIES ):
try:
if auto_init and os.access(parent_path, os.W_OK):
with FileLock(os.path.join(parent_path, desc.lower())):
return _check()
else:
return _check()
else:
return _check()
except FileLockException:
return ensure_installed(installable_context, install_func, auto_init)
except FileLockException:
time.sleep(1)
raise Exception("Failed to get file lock for %s for %s times" % (os.path.join(parent_path, desc.lower()), MAX_TRIES))