From a99ca1c6ddf425625c76d998b406d40f0405976e Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 26 Mar 2021 11:13:16 +0100 Subject: [PATCH 1/2] tools ignore slashed part of tool name --- avalon/pipeline.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/avalon/pipeline.py b/avalon/pipeline.py index e2d1a7f14..9dc54d0e7 100644 --- a/avalon/pipeline.py +++ b/avalon/pipeline.py @@ -580,7 +580,14 @@ def environ(self, session): "name": session["AVALON_ASSET"] }) tools = self.find_tools(asset) - tools_attr.extend(tools) + # Forwards compatibility + modified_tools = [] + for tool in tools: + parts = tool.split("/") + if len(parts) > 1: + parts.pop(0) + modified_tools.append("/".join(parts)) + tools_attr.extend(modified_tools) tools_env = acre.get_tools(tools_attr) dyn_env = acre.compute(tools_env) From 021be95bef12b748259f2f1c8077f595314c555c Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 26 Mar 2021 11:36:36 +0100 Subject: [PATCH 2/2] changed forward compatibility --- avalon/pipeline.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/avalon/pipeline.py b/avalon/pipeline.py index 9dc54d0e7..783f46107 100644 --- a/avalon/pipeline.py +++ b/avalon/pipeline.py @@ -580,13 +580,10 @@ def environ(self, session): "name": session["AVALON_ASSET"] }) tools = self.find_tools(asset) - # Forwards compatibility + # Forwards compatibility - replace slash with underscore modified_tools = [] for tool in tools: - parts = tool.split("/") - if len(parts) > 1: - parts.pop(0) - modified_tools.append("/".join(parts)) + modified_tools.append(tool.replace("/", "_")) tools_attr.extend(modified_tools) tools_env = acre.get_tools(tools_attr)