From daaaa5348bb1e544cd8ce8f65d5a401f2af0688e Mon Sep 17 00:00:00 2001 From: Anton Khodak Date: Sun, 28 Jan 2018 14:58:29 +0200 Subject: [PATCH] Do not evaluate expressions with `self` if input object is null --- cwltool/builder.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cwltool/builder.py b/cwltool/builder.py index b3a3d1d10..249e6f250 100644 --- a/cwltool/builder.py +++ b/cwltool/builder.py @@ -251,7 +251,8 @@ def do_eval(self, ex, context=None, pull_image=True, recursive=False): return {k: self.do_eval(v, context, pull_image, recursive) for k, v in iteritems(ex)} if isinstance(ex, list): return [self.do_eval(v, context, pull_image, recursive) for v in ex] - + if context is None and type(ex) is str and "self" in ex: + return None return expression.do_eval(ex, self.job, self.requirements, self.outdir, self.tmpdir, self.resources,