[ARVADOS] updated: 1.2.0-110-g466e236c4

Git user git at public.curoverse.com
Sat Sep 29 11:18:36 EDT 2018


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

       via  466e236c4174de64bdefeb1766160a11217c8c1c (commit)
      from  4a16f09d3df0c7899fa6367d27b9f66ee9d4582b (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 466e236c4174de64bdefeb1766160a11217c8c1c
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Sat Sep 29 11:17:29 2018 -0400

    a-c-r recognizes that http and https needs to be uploaded to keep
    
    refs #13573
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/runner.py b/sdk/cwl/arvados_cwl/runner.py
index 29c0535d9..41166c512 100644
--- a/sdk/cwl/arvados_cwl/runner.py
+++ b/sdk/cwl/arvados_cwl/runner.py
@@ -131,7 +131,8 @@ def upload_dependencies(arvrunner, name, document_loader,
     def only_real(obj):
         # Only interested in local files than need to be uploaded,
         # don't include file literals, keep references, etc.
-        if obj.get("location", "").startswith("file:"):
+        sp = obj.get("location", "").split(":")
+        if len(sp) > 1 and sp[0] in ("file", "http", "https"):
             sc.append(obj)
 
     visit_class(sc_result, ("File", "Directory"), only_real)

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list