2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/36ad8aa7b922/ changeset: 36ad8aa7b922 user: inithello date: 2012-12-19 17:08:26 summary: Fix for reinstalling tool shed repository with readme files. affected #: 1 file diff -r cda19f585a15241a1ee91a795a995a8f1dcca188 -r 36ad8aa7b922a0ea32d27c1b2506c9d715ad53bb 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 @@ -1569,11 +1569,13 @@ raw_text = response.read() response.close() readme_files_dict = from_json_string( raw_text ) + tool_dependencies = metadata.get( 'tool_dependencies', None ) + repository_dependencies = metadata.get( 'repository_dependencies', None ) containers_dict = suc.build_repository_containers_for_galaxy( trans=trans, toolshed_base_url=tool_shed_url, - repository_name=name, - repository_owner=repository_owner, - changeset_revision=changeset_revision, + repository_name=tool_shed_repository.name, + repository_owner=tool_shed_repository.owner, + changeset_revision=tool_shed_repository.installed_changeset_revision, readme_files_dict=readme_files_dict, repository_dependencies=repository_dependencies, tool_dependencies=tool_dependencies ) https://bitbucket.org/galaxy/galaxy-central/changeset/ba540beb1ced/ changeset: ba540beb1ced user: inithello date: 2012-12-19 17:14:44 summary: Merged changes from galaxy-dist-central. affected #: 1 file diff -r 715a7fe08b4c415e422c179250984d727d11673f -r ba540beb1cedb0a5040789036bd67359fc0fa64b 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 @@ -1569,11 +1569,13 @@ raw_text = response.read() response.close() readme_files_dict = from_json_string( raw_text ) + tool_dependencies = metadata.get( 'tool_dependencies', None ) + repository_dependencies = metadata.get( 'repository_dependencies', None ) containers_dict = suc.build_repository_containers_for_galaxy( trans=trans, toolshed_base_url=tool_shed_url, - repository_name=name, - repository_owner=repository_owner, - changeset_revision=changeset_revision, + repository_name=tool_shed_repository.name, + repository_owner=tool_shed_repository.owner, + changeset_revision=tool_shed_repository.installed_changeset_revision, readme_files_dict=readme_files_dict, repository_dependencies=repository_dependencies, tool_dependencies=tool_dependencies ) 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.