Only set the EnvVarRequirement cache entry if it would contain anything

mr-c · mr-c · commit 6db18b7c90d8 · 2025-02-20T09:59:38.000+01:00
diff --git a/cwltool/command_line_tool.py b/cwltool/command_line_tool.py
@@ -909,7 +909,8 @@ def remove_prefix(s: str, prefix: str) -> str:
                                 f"Attempting to preserve environment variable {key!r} which is not present"
                             )
 
-            keydict["EnvVarRequirement"] = env_def
+            if env_def:
+                keydict["EnvVarRequirement"] = env_def
             keydictstr = json_dumps(keydict, separators=(",", ":"), sort_keys=True)
             cachekey = hashlib.md5(keydictstr.encode("utf-8")).hexdigest()  # nosec
 

Original file line number	Diff line number	Diff line change
`@@ -909,7 +909,8 @@ def remove_prefix(s: str, prefix: str) -> str:`
`909`	`909`	`f"Attempting to preserve environment variable {key!r} which is not present"`
`910`	`910`	`)`
`911`	`911`
`912`		`- keydict["EnvVarRequirement"] = env_def`
	`912`	`+ if env_def:`
	`913`	`+ keydict["EnvVarRequirement"] = env_def`
`913`	`914`	`keydictstr = json_dumps(keydict, separators=(",", ":"), sort_keys=True)`
`914`	`915`	`cachekey = hashlib.md5(keydictstr.encode("utf-8")).hexdigest() # nosec`
`915`	`916`