[ARVADOS] updated: f4008e9c662be5b576f5e785a4c90cc1e2cfb5fa

[git at public.curoverse.com]

Summary of changes:
 sdk/python/arvados/commands/copy.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

       via  f4008e9c662be5b576f5e785a4c90cc1e2cfb5fa (commit)
      from  153020da61fa3ca2341aaf5d279e56d8c489aaaa (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 f4008e9c662be5b576f5e785a4c90cc1e2cfb5fa
Author: Tim Pierce <twp at curoverse.com>
Date:   Wed Oct 1 17:23:25 2014 -0400

    3699: copy_collection should process the full manifest line
    
    Bug fix: copy_collection was handling only the first block found on a
    manifest line.

diff --git a/sdk/python/arvados/commands/copy.py b/sdk/python/arvados/commands/copy.py
index 552211d..eca15de 100755
--- a/sdk/python/arvados/commands/copy.py
+++ b/sdk/python/arvados/commands/copy.py
@@ -28,6 +28,7 @@ import tempfile
 import arvados
 import arvados.config
 import arvados.keep
+import arvados.util
 
 logger = logging.getLogger('arvados.arv-copy')
 
@@ -351,11 +352,11 @@ def copy_collection(obj_uuid, src, dst, force=False):
     collection_blocks = set()
     src_keep = arvados.keep.KeepClient(src)
     for line in manifest.splitlines():
-        try:
-            block_hash = line.split()[1]
-            collection_blocks.add(block_hash)
-        except ValueError:
-            abort('bad manifest line in collection {}: {}'.format(obj_uuid, f))
+        for block_hash in line.split()[1:]:
+            if arvados.util.portable_data_hash_pattern.match(block_hash):
+                collection_blocks.add(block_hash)
+            else:
+                break
 
     # Copy each block from src_keep to dst_keep.
     dst_keep = arvados.keep.KeepClient(dst)

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


hooks/post-receive
--