2 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/016b0b22e826/ Changeset: 016b0b22e826 Branch: next-stable User: greg Date: 2013-06-01 20:29:31 Summary: Strip traling / from tool shed url when using it's value to search the Galaxy database. Affected #: 1 file
diff -r c3fe9ba931c20975711dad6e410c9a4d0601c1fc -r 016b0b22e826625ce39621aeebccdee4d3f6a959 lib/tool_shed/util/shed_util_common.py --- a/lib/tool_shed/util/shed_util_common.py +++ b/lib/tool_shed/util/shed_util_common.py @@ -685,6 +685,8 @@ def get_repository_for_dependency_relationship( app, tool_shed, name, owner, changeset_revision ): """Return a tool shed repository database record that is defined by either the current changeset revision or the installed_changeset_revision.""" # This method is used only in Galaxy, not the tool shed. + if tool_shed.endswith( '/' ): + tool_shed = tool_shed.rstrip( '/' ) repository = get_tool_shed_repository_by_shed_name_owner_installed_changeset_revision( app=app, tool_shed=tool_shed, name=name,
https://bitbucket.org/galaxy/galaxy-central/commits/f1bbaa14ddd1/ Changeset: f1bbaa14ddd1 User: greg Date: 2013-06-01 20:30:16 Summary: Merged from next-stable Affected #: 1 file
diff -r 7c9738db4d0004490329a87e15091a1be02628b6 -r f1bbaa14ddd16181c59d89a3f66d49a6e360c327 lib/tool_shed/util/shed_util_common.py --- a/lib/tool_shed/util/shed_util_common.py +++ b/lib/tool_shed/util/shed_util_common.py @@ -685,6 +685,8 @@ def get_repository_for_dependency_relationship( app, tool_shed, name, owner, changeset_revision ): """Return a tool shed repository database record that is defined by either the current changeset revision or the installed_changeset_revision.""" # This method is used only in Galaxy, not the tool shed. + if tool_shed.endswith( '/' ): + tool_shed = tool_shed.rstrip( '/' ) repository = get_tool_shed_repository_by_shed_name_owner_installed_changeset_revision( app=app, tool_shed=tool_shed, name=name,
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.
galaxy-commits@lists.galaxyproject.org