1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/f9c050410d6a/ Changeset: f9c050410d6a Branch: stable User: davebgx Date: 2014-06-03 22:52:18 Summary: Add change that was lost when resolving a merge conflict. Affected #: 1 file diff -r 96fdb9168f28b2ffa463195d084c9278efb2465a -r f9c050410d6a56d7f6fe503b4f22f286bd5a40e2 lib/tool_shed/galaxy_install/repository_util.py --- a/lib/tool_shed/galaxy_install/repository_util.py +++ b/lib/tool_shed/galaxy_install/repository_util.py @@ -622,11 +622,11 @@ # Get the tool_dependencies.xml file from the repository. tool_dependencies_config = suc.get_config_from_disk( 'tool_dependencies.xml', install_dir ) installed_tool_dependencies = \ - common_install_util.install_specified_packages( app=trans.app, - tool_shed_repository=tool_shed_repository, - tool_dependencies_config=tool_dependencies_config, - tool_dependencies=tool_shed_repository.tool_dependencies, - from_tool_migration_manager=False ) + common_install_util.install_specified_tool_dependencies( app=trans.app, + tool_shed_repository=tool_shed_repository, + tool_dependencies_config=tool_dependencies_config, + tool_dependencies=tool_shed_repository.tool_dependencies, + from_tool_migration_manager=False ) suc.remove_dir( work_dir ) suc.update_tool_shed_repository_status( trans.app, tool_shed_repository, @@ -880,11 +880,11 @@ # Get the tool_dependencies.xml file from the repository. tool_dependencies_config = suc.get_config_from_disk( 'tool_dependencies.xml', repository.repo_path( trans.app ) ) installed_tool_dependencies = \ - common_install_util.install_specified_packages( app=trans.app, - tool_shed_repository=repository, - tool_dependencies_config=tool_dependencies_config, - tool_dependencies=repository.tool_dependencies, - from_tool_migration_manager=False ) + common_install_util.install_specified_tool_dependencies( app=trans.app, + tool_shed_repository=repository, + tool_dependencies_config=tool_dependencies_config, + tool_dependencies=repository.tool_dependencies, + from_tool_migration_manager=False ) for installed_tool_dependency in installed_tool_dependencies: if installed_tool_dependency.status in [ trans.install_model.ToolDependency.installation_status.ERROR ]: repair_dict = add_repair_dict_entry( repository.name, installed_tool_dependency.error_message ) 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.