2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/2a68e5c0cbec/ Changeset: 2a68e5c0cbec Branch: stable User: davebgx Date: 2014-02-19 21:21:12 Summary: Fix for situation where duplicate database records would be created if a repository was uninstalled and reinstalled after getting updates from the tool shed. Affected #: 2 files diff -r 1480f00e6bdcebe043b695fa1daaa0220fc0c086 -r 2a68e5c0cbec107210d45cd35271ba80a7436f3c lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py --- a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py +++ b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py @@ -1381,7 +1381,7 @@ repository_dependencies = repository_dependency_util.get_repository_dependencies_for_installed_tool_shed_repository( trans, tool_shed_repository ) repo_info_dict = repository_util.create_repo_info_dict( trans=trans, repository_clone_url=repository_clone_url, - changeset_revision=tool_shed_repository.changeset_revision, + changeset_revision=tool_shed_repository.installed_changeset_revision, ctx_rev=tool_shed_repository.ctx_rev, repository_owner=tool_shed_repository.owner, repository_name=tool_shed_repository.name, diff -r 1480f00e6bdcebe043b695fa1daaa0220fc0c086 -r 2a68e5c0cbec107210d45cd35271ba80a7436f3c 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 @@ -1617,6 +1617,13 @@ except: pass +def __repository_query( app ): + if app.name == "galaxy": + query = app.install_model.context.query( app.install_model.ToolShedRepository ) + else: + query = app.model.context.query( app.model.Repository ) + return query + def repository_was_previously_installed( trans, tool_shed_url, repository_name, repo_info_tuple ): """ Find out if a repository is already installed into Galaxy - there are several scenarios where this @@ -1866,10 +1873,3 @@ for arg in args: parts.append( arg.strip( '/' ) ) return '/'.join( parts ) - -def __repository_query( app ): - if app.name == "galaxy": - query = app.install_model.context.query( app.install_model.ToolShedRepository ) - else: - query = app.model.context.query( app.model.Repository ) - return query https://bitbucket.org/galaxy/galaxy-central/commits/7b4be3dda0f2/ Changeset: 7b4be3dda0f2 User: davebgx Date: 2014-02-20 21:52:09 Summary: Merge stable. Affected #: 1 file 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.