Skip to content

Commit 8d19cdb

Browse files
authored
Merge pull request #848 from common-workflow-language/workflowstep_valuefrom_dir_listing
WorkflowStepInput.valueFrom: populate Directory.listing
2 parents 440bbba + 6fe9cd7 commit 8d19cdb

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

cwltool/workflow.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
from .errors import WorkflowException
2525
from .load_tool import load_tool
2626
from .loghandler import _logger
27+
from .pathmapper import adjustDirObjs, get_listing
2728
from .mutation import MutationManager # pylint: disable=unused-import
2829
from .process import Process, get_overrides, shortname, uniquename
2930
from .software_requirements import ( # pylint: disable=unused-import
@@ -341,6 +342,8 @@ def postScatterEval(io):
341342

342343
def valueFromFunc(k, v): # type: (Any, Any) -> Any
343344
if k in valueFrom:
345+
adjustDirObjs(v, functools.partial(get_listing,
346+
fs_access, recursive=True))
344347
return expression.do_eval(
345348
valueFrom[k], shortio, self.workflow.requirements,
346349
None, None, {}, context=v,

0 commit comments

Comments
 (0)