From 9467106ee01ef5a08ede2e3b67a720a282edaa7b Mon Sep 17 00:00:00 2001 From: John Chilton Date: Thu, 5 Nov 2020 15:19:24 -0500 Subject: [PATCH] Or maybe this? --- lib/galaxy/tools/toolbox/base.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/galaxy/tools/toolbox/base.py b/lib/galaxy/tools/toolbox/base.py index fd8a4740025..2d80b7cdfd2 100644 --- a/lib/galaxy/tools/toolbox/base.py +++ b/lib/galaxy/tools/toolbox/base.py @@ -519,11 +519,12 @@ class AbstractToolBox(Dictifiable, ManagesIntegratedToolPanelMixin): rval.append(lineage_tool) if not rval: # still no tool, do a deeper search and try to match by old ids + for tool in self._tools_by_id.values(): + if tool.old_id == tool_id: + rval.append(tool) if get_all_versions and tool_id in self._tool_versions_by_id: - rval.extend(self._tool_versions_by_id[tool_id].values()) - else: - for tool in self._tools_by_id.values(): - if tool.old_id == tool_id: + for tool in self._tool_versions_by_id[tool_id].values(): + if tool not in rval: rval.append(tool) # if we don't have a lineage_map for this tool we need to sort by version,