1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/c9bdeba75bd1/ changeset: c9bdeba75bd1 user: greg date: 2012-02-08 15:11:19 summary: Fix for getting updates for an installed tool shed repository change set revision. affected #: 2 files
diff -r e23be4cf5276a0570d784b3ade9fbad9f9fb351c -r c9bdeba75bd18157ea4bf8e64d7278f6c8891eea lib/galaxy/util/shed_util.py --- a/lib/galaxy/util/shed_util.py +++ b/lib/galaxy/util/shed_util.py @@ -338,6 +338,7 @@ sa_session = app.model.context.current if tool_shed.find( '//' ) > 0: tool_shed = tool_shed.split( '//' )[1] + tool_shed = tool_shed.rstrip( '/' ) return sa_session.query( app.model.ToolShedRepository ) \ .filter( and_( app.model.ToolShedRepository.table.c.tool_shed == tool_shed, app.model.ToolShedRepository.table.c.name == name,
diff -r e23be4cf5276a0570d784b3ade9fbad9f9fb351c -r c9bdeba75bd18157ea4bf8e64d7278f6c8891eea lib/galaxy/web/controllers/admin_toolshed.py --- a/lib/galaxy/web/controllers/admin_toolshed.py +++ b/lib/galaxy/web/controllers/admin_toolshed.py @@ -699,7 +699,7 @@ # Send a request to the relevant tool shed to see if there are any updates. repository = get_repository( trans, kwd[ 'id' ] ) tool_shed_url = get_url_from_repository_tool_shed( trans.app, repository ) - url = '%/srepository/check_for_updates?galaxy_url=%s&name=%s&owner=%s&changeset_revision=%s&webapp=galaxy' % \ + url = '%s/repository/check_for_updates?galaxy_url=%s&name=%s&owner=%s&changeset_revision=%s&webapp=galaxy' % \ ( tool_shed_url, url_for( '/', qualified=True ), repository.name, repository.owner, repository.changeset_revision ) return trans.response.send_redirect( url ) @web.expose @@ -731,7 +731,7 @@ repository_clone_url = os.path.join( tool_shed_url, 'repos', owner, name ) tool_shed = clean_tool_shed_url( tool_shed_url ) tool_shed_repository, metadata_dict = load_repository_contents( app=trans.app, - name=name, + repository_name=name, description=repository.description, owner=owner, changeset_revision=changeset_revision, @@ -743,7 +743,8 @@ tool_shed=tool_shed, tool_section=None, shed_tool_conf=None, - new_install=False ) + new_install=False, + dist_to_shed=False ) # Update the repository changeset_revision in the database. repository.changeset_revision = latest_changeset_revision repository.update_available = False
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.