From a16cb06705676aa49e725c8ab58521c239dfea4d Mon Sep 17 00:00:00 2001 From: Greg Von Kuster Date: Sun, 22 Nov 2015 16:50:39 -0500 Subject: [PATCH] Fix for re-installing an uninstalled TS repository with a dependency where both the repository and the dependency were updated in the TS after the repository was uninstalled. --- lib/tool_shed/util/shed_util_common.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/tool_shed/util/shed_util_common.py b/lib/tool_shed/util/shed_util_common.py index 553817edf2b..0e8a28d3fa8 100644 --- a/lib/tool_shed/util/shed_util_common.py +++ b/lib/tool_shed/util/shed_util_common.py @@ -511,6 +511,11 @@ def get_repository_for_dependency_relationship( app, tool_shed, name, owner, cha name=name, owner=owner, changeset_revision=changeset_revision ) + if not repository: + tool_shed_url = common_util.get_tool_shed_url_from_tool_shed_registry( app, tool_shed ) + repository_clone_url = os.path.join( tool_shed_url, 'repos', owner, name ) + repo_info_tuple = (None, repository_clone_url, changeset_revision, None, owner, None, None) + repository, pcr = repository_was_previously_installed( app, tool_shed_url, name, repo_info_tuple ) if not repository: # The received changeset_revision is no longer installable, so get the next changeset_revision # in the repository's changelog in the tool shed that is associated with repository_metadata.