[arvados] updated: 2.6.0-573-g29fd26f3cb

[git repository hosting]

Summary of changes:
 sdk/cwl/arvados_cwl/pathmapper.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

       via  29fd26f3cb79df8cf4f7f6e1688af0205687dcc8 (commit)
      from  216b408ecb9774dd6c3f562f242787de1acfe78d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 29fd26f3cb79df8cf4f7f6e1688af0205687dcc8
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Mon Sep 11 13:02:42 2023 -0400

    20937: Fix pathmapper use of http_to_keep
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/sdk/cwl/arvados_cwl/pathmapper.py b/sdk/cwl/arvados_cwl/pathmapper.py
index 539188fddd..448facf776 100644
--- a/sdk/cwl/arvados_cwl/pathmapper.py
+++ b/sdk/cwl/arvados_cwl/pathmapper.py
@@ -109,9 +109,10 @@ class ArvPathMapper(PathMapper):
                         # passthrough, we'll download it later.
                         self._pathmap[src] = MapperEnt(src, src, srcobj["class"], True)
                     else:
-                        keepref = "keep:%s/%s" % http_to_keep(self.arvrunner.api, self.arvrunner.project_uuid, src,
+                        results = 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" % (results[0], results[1])
                         logger.info("%s is %s", src, keepref)
                         self._pathmap[src] = MapperEnt(keepref, keepref, srcobj["class"], True)
                 except Exception as e:

-----------------------------------------------------------------------


hooks/post-receive
--