10165: Handle copying complete collection contents into subdirectory.

diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py
index ef4f78552989764a8a1e02234939021c1f44415c..5bdffd5048a4625a8ae240d2e16684f0c6de3384 100644 (file)
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@ -188,7 +188,8 @@ class ArvCwlRunner(object):
                 srccollections[srccollection] = arvados.collection.CollectionReader(srccollection)
             reader = srccollections[srccollection]
             try:
-                final.copy("/".join(sp[1:]), v.target, source_collection=reader, overwrite=False)
+                srcpath = "/".join(sp[1:]) if len(sp) > 1 else "."
+                final.copy(srcpath, v.target, source_collection=reader, overwrite=False)
             except IOError as e:
                 logger.warn("While preparing output collection: %s", e)