From 05cad6df38b072718e78f0fc21ac01d3eb8dc93a Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Tue, 23 Aug 2022 15:47:56 +0200 Subject: [PATCH] Fix finding repository directory if repository directory is repeated in path As happens for instance for toolshed.g2.bx.psu.edu/repos/devteam/ncbi_blast_plus/0e3cf9594bb7/ncbi_blast_plus/tools/ncbi_blast_plus --- lib/galaxy/tools/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/tools/__init__.py b/lib/galaxy/tools/__init__.py index 13323f40103..10dae2bd941 100644 --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -1063,7 +1063,7 @@ class Tool(Dictifiable): if getattr(self, 'tool_shed', None): tool_dir = Path(self.tool_dir) for repo_dir in itertools.chain([tool_dir], tool_dir.parents): - if repo_dir.name == self.repository_name: + if repo_dir.name == self.repository_name and repo_dir.parent.name == self.installed_changeset_revision: return str(repo_dir) else: log.error("Problem finding repository dir for tool '%s'" % self.id)