1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/cf8748a743a7/ changeset: cf8748a743a7 user: greg date: 2011-09-02 21:53:04 summary: A couple of bug fixes in handling tool shed installs. affected #: 1 file (524 bytes) --- a/lib/galaxy/web/base/controller.py Fri Sep 02 14:59:31 2011 -0400 +++ b/lib/galaxy/web/base/controller.py Fri Sep 02 15:53:04 2011 -0400 @@ -2768,10 +2768,15 @@ try: repository_tool = trans.app.toolbox.load_tool( full_path ) if repository_tool: - repository_tools_tups.append( ( relative_path.lstrip( '%s/' % tool_path ), repository_tool ) ) + # At this point, we need to lstrip tool_path from relative_path,m but we + # have to be careful, so we do this the following way instead of using lstrip(). + items = relative_path.split( '/' ) + lstriped_items = items[ 2: ] + tup_path = '/'.join( lstriped_items ) + repository_tools_tups.append( ( tup_path, repository_tool ) ) except Exception, e: # We have an inavlid .xml file, so not a tool config. - log.debug("Ignoring invalid tool config (%s)." % str( relative_path )) + log.debug( "Ignoring invalid tool config (%s). Error: %s" % ( str( relative_path ), str( e ) ) ) if repository_tools_tups: # Generate an in-memory tool conf section that includes the new tools. new_tool_section = self.__generate_tool_panel_section( repository_name, @@ -2865,7 +2870,7 @@ if tool_shed_url.find( ':' ) > 0: # Eliminate the port, if any, since it will result in an invalid directory name. return tool_shed_url.split( ':' )[ 0 ] - return tool_shed_url + return tool_shed_url.rstrip( '/' ) def __clean_repository_clone_url( self, repository_clone_url ): if repository_clone_url.find( '@' ) > 0: # We have an url that includes an authenticated user, something like: 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.