[ARVADOS] updated: 2.1.0-2452-g1a6cf8e65

[Git user]

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

       via  1a6cf8e65c86a0002f0cf0c3a2d4092b67f9b57b (commit)
      from  12e0b04c56f0e1ba9dd0f0450d9e96ceee04f1b7 (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 1a6cf8e65c86a0002f0cf0c3a2d4092b67f9b57b
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu May 12 17:20:55 2022 -0400

    19109: Avoid recursion fail mode
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/sdk/cwl/arvados_cwl/runner.py b/sdk/cwl/arvados_cwl/runner.py
index 995b23c08..c8668afca 100644
--- a/sdk/cwl/arvados_cwl/runner.py
+++ b/sdk/cwl/arvados_cwl/runner.py
@@ -166,10 +166,13 @@ def set_secondary(fsaccess, builder, inputschema, secondaryspec, primary, discov
             set_secondary(fsaccess, builder, {"type": inputschema["items"]}, secondaryspec, p, discovered)
 
     elif (inputschema["type"] == "File" and
-          secondaryspec and
           isinstance(primary, Mapping) and
-          primary.get("class") == "File" and
-          "secondaryFiles" not in primary):
+          primary.get("class") == "File"):
+
+        if "secondaryFiles" in primary or not secondaryspec:
+            # Nothing to do.
+            return
+
         #
         # Found a file, check for secondaryFiles
         #

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


hooks/post-receive
--