6095: Brown paper bag fix the last commit.
authorBrett Smith <brett@curoverse.com>
Tue, 18 Aug 2015 12:44:06 +0000 (08:44 -0400)
committerBrett Smith <brett@curoverse.com>
Tue, 18 Aug 2015 12:44:06 +0000 (08:44 -0400)
I swear I tried to test before I pushed, but I used --no-recursive,
which meant we never got to this code.  That also explains why we
didn't catch the lack of recursion earlier.  Apologies.  Refs #6095.

sdk/python/arvados/commands/arv_copy.py

index c1ee156bcca0ea2410fa86f9d764c6c4f54a6d32..8ee61f5bc123f260f566f373e878bef8ee8d5f26 100755 (executable)
@@ -330,10 +330,10 @@ def copy_collections(obj, src, dst, args):
         obj = arvados.util.collection_uuid_pattern.sub(copy_collection_fn, obj)
         return obj
     elif isinstance(obj, dict):
-        return type(v)((v, copy_collections(obj[v], src, dst, args))
-                       for v in obj)
+        return type(obj)((v, copy_collections(obj[v], src, dst, args))
+                         for v in obj)
     elif isinstance(obj, list):
-        return type(v)(copy_collections(v, src, dst, args) for v in obj)
+        return type(obj)(copy_collections(v, src, dst, args) for v in obj)
     return obj
 
 def migrate_jobspec(jobspec, src, dst, dst_repo, args):