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

Merge latest next-stable.

Browse Source
This commit is contained in:
John Chilton
2014-09-25 09:03:21 -04:00
parent 8bb577249b 965d1a3a52
commit ce783e7777
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tool_list.py
+9 -2
View File
@@ -4,8 +4,15 @@ import sys
#--------read tool_conf.xml to get all the tool xml file names-----------
onoff = 1
tool_list = []
tool_conf_file = os.environ.get( 'GALAXY_TEST_TOOL_CONF', 'config/tool_conf.xml' )
if not os.path.isfile(tool_conf_file):
tool_conf_file = os.environ.get( 'GALAXY_TEST_TOOL_CONF', None )
if tool_conf_file is None:
for possible_tool_file in [ 'config/tool_conf.xml', 'tool_conf.xml', 'config/tool_conf.xml.sample' ]:
tool_conf_file = possible_tool_file
if os.path.isfile( possible_tool_file ):
break
if tool_conf_file is None or not os.path.isfile(tool_conf_file):
sys.stderr.write( "Tool config file not found: {}\n".format(tool_conf_file) )
sys.exit(1)