15028: Fix set_secondary with union types
authorPeter Amstutz <pamstutz@veritasgenetics.com>
Fri, 3 May 2019 19:29:16 +0000 (15:29 -0400)
committerPeter Amstutz <pamstutz@veritasgenetics.com>
Fri, 3 May 2019 19:29:16 +0000 (15:29 -0400)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

sdk/cwl/arvados_cwl/runner.py

index 752cc32ba69cfdf2dc880f7de9338251e4d1d3b1..68b2fd827a6e62cc71fb1d30f96ede26f8db3eaf 100644 (file)
@@ -137,8 +137,8 @@ def set_secondary(fsaccess, builder, inputschema, secondaryspec, primary, discov
         # set secondaryFiles, may be inherited by compound types.
         secondaryspec = inputschema["secondaryFiles"]
 
-    if isinstance(inputschema["type"], Mapping):
-        # compound type (array or record)
+    if isinstance(inputschema["type"], (Mapping, Sequence)):
+        # compound type (union, array, record)
         set_secondary(fsaccess, builder, inputschema["type"], secondaryspec, primary, discovered)
 
     elif (inputschema["type"] == "record" and