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

Make sure a shed related tool config is defined in universe_wsgi.ini before allowing automatic tool installs from a tool shed.

Browse Source
This commit is contained in:
Greg Von Kuster
2012-07-13 19:09:51 -04:00
parent e38c49ea15
commit 5232d4e52c
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/web/controllers/admin_toolshed.py
+11 -1
View File
@@ -945,7 +945,7 @@ class AdminToolshed( AdminGalaxy ):
@web.expose
@web.require_admin
def prepare_for_install( self, trans, **kwd ):
if not trans.app.toolbox.shed_tool_confs:
if not have_shed_tool_conf_for_install( trans ):
message = 'The <b>tool_config_file</b> setting in <b>universe_wsgi.ini</b> must include at least one shed tool configuration file name with a '
message += '<b>&lt;toolbox&gt;</b> tag that includes a <b>tool_path</b> attribute value which is a directory relative to the Galaxy installation '
message += 'directory in order to automatically install tools from a Galaxy tool shed (e.g., the file name <b>shed_tool_conf.xml</b> whose '
@@ -1566,3 +1566,13 @@ def get_repository( trans, id ):
def get_tool_dependency( trans, id ):
"""Get a tool_dependency from the database via id"""
return trans.sa_session.query( trans.model.ToolDependency ).get( trans.security.decode_id( id ) )
def have_shed_tool_conf_for_install( trans ):
if not trans.app.toolbox.shed_tool_confs:
return False
migrated_tools_conf_path, migrated_tools_conf_name = os.path.split( trans.app.config.migrated_tools_config )
for shed_tool_conf_dict in trans.app.toolbox.shed_tool_confs:
shed_tool_conf = shed_tool_conf_dict[ 'config_filename' ]
shed_tool_conf_path, shed_tool_conf_name = os.path.split( shed_tool_conf )
if shed_tool_conf_name != migrated_tools_conf_name:
return True
return False