2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/1621b66460e0/ Changeset: 1621b66460e0 Branch: next-stable User: davebgx Date: 2014-07-30 20:12:40 Summary: Fix the tool shed URL for tools that have been installed from a tool shed using a proxy prefix. Affected #: 1 file diff -r 60419c47c22f23bee6545f8feaf31d14bc6eefe7 -r 1621b66460e0533de4ee155bf23a5f0fabb43e40 lib/galaxy/model/tool_shed_install/__init__.py --- a/lib/galaxy/model/tool_shed_install/__init__.py +++ b/lib/galaxy/model/tool_shed_install/__init__.py @@ -79,6 +79,9 @@ def get_sharable_url( self, app ): tool_shed_url = common_util.get_tool_shed_url_from_tool_shed_registry( app, self.tool_shed ) if tool_shed_url: + # Append a slash to the tool shed URL, because urlparse.urljoin will eliminate + # the last part of a URL if it does not end with a forward slash. + tool_shed_url = '%s/' % tool_shed_url return urljoin( tool_shed_url, 'view/%s/%s' % ( self.owner, self.name ) ) return tool_shed_url https://bitbucket.org/galaxy/galaxy-central/commits/03350a21700c/ Changeset: 03350a21700c User: davebgx Date: 2014-07-30 20:13:07 Summary: Merge with 1621b66460e0533de4ee155bf23a5f0fabb43e40 Affected #: 1 file diff -r 42b8dd13c021b3500e0ebfd416ee2267c28b47a2 -r 03350a21700c83d042a952d82387bb295c25fb73 lib/galaxy/model/tool_shed_install/__init__.py --- a/lib/galaxy/model/tool_shed_install/__init__.py +++ b/lib/galaxy/model/tool_shed_install/__init__.py @@ -79,6 +79,9 @@ def get_sharable_url( self, app ): tool_shed_url = common_util.get_tool_shed_url_from_tool_shed_registry( app, self.tool_shed ) if tool_shed_url: + # Append a slash to the tool shed URL, because urlparse.urljoin will eliminate + # the last part of a URL if it does not end with a forward slash. + tool_shed_url = '%s/' % tool_shed_url return urljoin( tool_shed_url, 'view/%s/%s' % ( self.owner, self.name ) ) return tool_shed_url 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.