1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/6624cd467f30/ changeset: 6624cd467f30 user: richard_burhans date: 2012-11-06 17:22:56 summary: Fixed installation of toolsheds containing proprietary datatypes affected #: 1 file diff -r efccb227d72ccb2764544fd461195789653b4509 -r 6624cd467f30618d5a1319e14b2a41ab7c6a2407 lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py --- a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py +++ b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py @@ -745,10 +745,11 @@ Generate the metadata for the installed tool shed repository, among other things. This method is called from Galaxy (never the tool shed) when an admin is installing a new repository or reinstalling an uninstalled repository. """ + shed_config_dict = trans.app.toolbox.get_shed_config_dict_by_filename( shed_tool_conf ) metadata_dict, invalid_file_tups = generate_metadata_for_changeset_revision( app=trans.app, repository=tool_shed_repository, repository_clone_url=repository_clone_url, - shed_config_dict = trans.app.toolbox.get_shed_config_dict_by_filename( shed_tool_conf ), + shed_config_dict=shed_config_dict, relative_install_dir=relative_install_dir, repository_files_dir=None, resetting_all_metadata_on_repository=False, @@ -791,9 +792,12 @@ tool_shed_repository.includes_datatypes = True trans.sa_session.add( tool_shed_repository ) trans.sa_session.flush() - datatypes_config = get_config_from_disk( 'datatypes_conf.xml', relative_install_dir ) + files_dir = relative_install_dir + if shed_config_dict.get( 'tool_path' ): + files_dir = os.path.join( shed_config_dict['tool_path'], files_dir ) + datatypes_config = get_config_from_disk( 'datatypes_conf.xml', files_dir ) # Load data types required by tools. - converter_path, display_path = alter_config_and_load_prorietary_datatypes( trans.app, datatypes_config, relative_install_dir, override=False ) + converter_path, display_path = alter_config_and_load_prorietary_datatypes( trans.app, datatypes_config, files_dir, override=False ) if converter_path or display_path: # Create a dictionary of tool shed repository related information. repository_dict = create_repository_dict_for_proprietary_datatypes( tool_shed=tool_shed, 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.