Merge pull request #14497 from mvdbeek/fix_finding_repository_directory

[21.05] Fix finding repository directory if repository is repeated in path
This commit is contained in:
Dannon
2022-08-31 08:11:58 -04:00
committed by GitHub
+1 -1
View File
@@ -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)