1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/e3808d426ef2/ Changeset: e3808d426ef2 User: greg Date: 2014-04-28 21:58:48 Summary: Handle changing http protocols in the tool shed registry's password_manager_for_url() function. Affected #: 1 file
diff -r 04befb2eb25baa347a3f440ed22045d01e75ebc7 -r e3808d426ef2387a25aa79cbba397a6ec2f0d8f5 lib/tool_shed/tool_shed_registry.py --- a/lib/tool_shed/tool_shed_registry.py +++ b/lib/tool_shed/tool_shed_registry.py @@ -2,6 +2,7 @@ import sys import urllib2 from galaxy.util.odict import odict +from tool_shed.util import common_util from tool_shed.util import xml_util
log = logging.getLogger( __name__ ) @@ -39,13 +40,17 @@
def password_manager_for_url( self, url ): """ - If the tool shed is using external auth, the client to the tool shed must authenticate to that as well. This provides access to the - urllib2.HTTPPasswordMgrWithdefaultRealm() object for the url passed in. + If the tool shed is using external auth, the client to the tool shed must authenticate to that + as well. This provides access to the urllib2.HTTPPasswordMgrWithdefaultRealm() object for the + url passed in.
- Following more what galaxy.demo_sequencer.controllers.common does might be more appropriate at some stage... + Following more what galaxy.demo_sequencer.controllers.common does might be more appropriate at + some stage... """ + url_sans_protocol = common_util.remove_protocol_from_tool_shed_url( url ) for shed_name, shed_url in self.tool_sheds.items(): - if shed_url.find( url ) >= 0: + shed_url_sans_protocol = common_util.remove_protocol_from_tool_shed_url( shed_url ) + if shed_url_sans_protocol.find( url_sans_protocol ) >= 0: return self.tool_sheds_auth[ shed_name ] log.debug( "Invalid url '%s' received by tool shed registry's password_manager_for_url method." % str( url ) ) return None
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.