X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/08078f621c8dbc1ecbd6e030bb0fac848cb6a01c..9f86e39c7720f1291194fc8eea867a175e94e07f:/sdk/cwl/arvados_cwl/pathmapper.py diff --git a/sdk/cwl/arvados_cwl/pathmapper.py b/sdk/cwl/arvados_cwl/pathmapper.py index e2e287bf1d..3f54a396bb 100644 --- a/sdk/cwl/arvados_cwl/pathmapper.py +++ b/sdk/cwl/arvados_cwl/pathmapper.py @@ -26,7 +26,7 @@ from cwltool.utils import adjustFileObjs, adjustDirObjs from cwltool.stdfsaccess import abspath from cwltool.workflow import WorkflowException -from .http import http_to_keep +from arvados.http_to_keep import http_to_keep logger = logging.getLogger('arvados.cwl-runner') @@ -109,9 +109,9 @@ class ArvPathMapper(PathMapper): # passthrough, we'll download it later. self._pathmap[src] = MapperEnt(src, src, srcobj["class"], True) else: - keepref = http_to_keep(self.arvrunner.api, self.arvrunner.project_uuid, src, - varying_url_params=self.arvrunner.toplevel_runtimeContext.varying_url_params, - prefer_cached_downloads=self.arvrunner.toplevel_runtimeContext.prefer_cached_downloads) + keepref = "keep:%s/%s" % http_to_keep(self.arvrunner.api, self.arvrunner.project_uuid, src, + varying_url_params=self.arvrunner.toplevel_runtimeContext.varying_url_params, + prefer_cached_downloads=self.arvrunner.toplevel_runtimeContext.prefer_cached_downloads) logger.info("%s is %s", src, keepref) self._pathmap[src] = MapperEnt(keepref, keepref, srcobj["class"], True) except Exception as e: