[ARVADOS] updated: 73c9a44b85ba72e881c5133422fcabe3f1322142

git at public.curoverse.com git at public.curoverse.com
Mon May 4 13:07:31 EDT 2015


Summary of changes:
 sdk/python/arvados/commands/arv_copy.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

       via  73c9a44b85ba72e881c5133422fcabe3f1322142 (commit)
       via  83164dbf6265f4d676324b2527ac558d1660663a (commit)
      from  ffadd5d842dc27fdc34af809c51a9982f3c4b4fa (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 73c9a44b85ba72e881c5133422fcabe3f1322142
Merge: ffadd5d 83164db
Author: Brett Smith <brett at curoverse.com>
Date:   Mon May 4 13:07:19 2015 -0400

    Merge branch '5752-arv-copy-preserve-docker-timestamps-wip'
    
    Closes #5752, #5881.


commit 83164dbf6265f4d676324b2527ac558d1660663a
Author: Brett Smith <brett at curoverse.com>
Date:   Fri May 1 14:07:04 2015 -0400

    5752: arv-copy preserves properties of docker_image links.
    
    The properties include the image_timestamp, which tells Arvados when
    the source image was created, rather than the containing collection.
    The API server uses this information to determine which image is
    newest.

diff --git a/sdk/python/arvados/commands/arv_copy.py b/sdk/python/arvados/commands/arv_copy.py
index 54d9798..c64b645 100755
--- a/sdk/python/arvados/commands/arv_copy.py
+++ b/sdk/python/arvados/commands/arv_copy.py
@@ -410,12 +410,10 @@ def create_collection_from(c, src, dst, args):
     for link_class in ("docker_image_repo+tag", "docker_image_hash"):
         docker_links = src.links().list(filters=[["head_uuid", "=", collection_uuid], ["link_class", "=", link_class]]).execute(num_retries=args.retries)['items']
 
-        for d in docker_links:
-            body={
-                'head_uuid': dst_collection['uuid'],
-                'link_class': link_class,
-                'name': d['name'],
-            }
+        for src_link in docker_links:
+            body = {key: src_link[key]
+                    for key in ['link_class', 'name', 'properties']}
+            body['head_uuid'] = dst_collection['uuid']
             body['owner_uuid'] = args.project_uuid
 
             lk = dst.links().create(body=body).execute(num_retries=args.retries)

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list