commit/galaxy-central: davebgx: Merge fix from stable.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/8f6cba970f9e/ Changeset: 8f6cba970f9e User: davebgx Date: 2014-04-28 19:20:00 Summary: Merge fix from stable. Affected #: 1 file diff -r d10b0cdffb0f8dda2a7cb5344ec0152f3e678818 -r 8f6cba970f9ee28477a4e763218d0cce73cb9a21 templates/admin/tool_shed_repository/install_tool_dependencies_with_update.mako --- a/templates/admin/tool_shed_repository/install_tool_dependencies_with_update.mako +++ b/templates/admin/tool_shed_repository/install_tool_dependencies_with_update.mako @@ -53,16 +53,21 @@ %for key, requirements_dict in tool_dependencies_dict.items(): <% readme_text = None - key_items = key.split( '/' ) - key_name = key_items[ 0 ] - key_version = key_items[ 1 ] - readme_text = requirements_dict.get( 'readme', None ) - install_dir = os.path.join( trans.app.config.tool_dependency_dir, - key_name, - key_version, - repository.owner, - repository.name, - repository.installed_changeset_revision ) + if key == 'set_environment': + key_name = ', '.join( [ environment_variable[ 'name' ] for environment_variable in requirements_dict ] ) + key_version = '' + install_dir = '' + else: + key_items = key.split( '/' ) + key_name = key_items[ 0 ] + key_version = key_items[ 1 ] + readme_text = requirements_dict.get( 'readme', None ) + install_dir = os.path.join( trans.app.config.tool_dependency_dir, + key_name, + key_version, + repository.owner, + repository.name, + repository.installed_changeset_revision ) %> %if not os.path.exists( install_dir ): <tr> 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.
participants (1)
-
commits-noreply@bitbucket.org