1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/02ce2ca3fa2d/ changeset: 02ce2ca3fa2d user: greg date: 2012-07-14 01:09:51 summary: Make sure a shed related tool config is defined in universe_wsgi.ini before allowing automatic tool installs from a tool shed. affected #: 1 file
diff -r 35ff11e3863804767d602d2fb8bff08f2c67e35f -r 02ce2ca3fa2dac4c4155b7f07f0699d519b4d853 lib/galaxy/web/controllers/admin_toolshed.py --- a/lib/galaxy/web/controllers/admin_toolshed.py +++ b/lib/galaxy/web/controllers/admin_toolshed.py @@ -945,7 +945,7 @@ @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><toolbox></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_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
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.