X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0ff7b94edaaaa07932ae757c0a2b7ba3fde026cb..5c9aedbd8e623a518f5e1a92e4064a25ddd66353:/sdk/cwl/arvados_cwl/arvworkflow.py diff --git a/sdk/cwl/arvados_cwl/arvworkflow.py b/sdk/cwl/arvados_cwl/arvworkflow.py index 6087648a45..ab8ad035fd 100644 --- a/sdk/cwl/arvados_cwl/arvworkflow.py +++ b/sdk/cwl/arvados_cwl/arvworkflow.py @@ -6,7 +6,7 @@ import logging from cwltool.pack import pack from cwltool.load_tool import fetch_document from cwltool.process import shortname -from cwltool.workflow import Workflow +from cwltool.workflow import Workflow, WorkflowException from cwltool.pathmapper import adjustFileObjs, adjustDirObjs import ruamel.yaml as yaml @@ -83,8 +83,10 @@ class ArvadosWorkflow(Workflow): def keepmount(obj): if obj["location"].startswith("keep:"): obj["location"] = "/keep/" + obj["location"][5:] + elif obj["location"].startswith("_:"): + pass else: - raise Exception("Uh oh %s" % obj["location"]) + raise WorkflowException("Location is not a keep reference or a literal: '%s'" % obj["location"]) if "listing" in obj: del obj["listing"] adjustFileObjs(joborder_keepmount, keepmount)