Skip to content

Commit 75dcbf5

Browse files
author
Peter Amstutz
committed
Fix Javascript evaluation to use expressionLib from most specific requirement,
not most general.
1 parent e443e0f commit 75dcbf5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

cwltool/expression.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def do_eval(ex, jobinput, requirements, outdir, tmpdir, resources,
140140
if isinstance(ex, dict) and "engine" in ex and "script" in ex:
141141
return exeval(ex, jobinput, requirements, outdir, tmpdir, context, pull_image)
142142
if isinstance(ex, (str, unicode)):
143-
for r in requirements:
143+
for r in reversed(requirements):
144144
if r["class"] == "InlineJavascriptRequirement":
145145
return sandboxjs.interpolate(str(ex), jshead(r.get("expressionLib", []), rootvars),
146146
timeout=timeout)

0 commit comments

Comments
 (0)