[ARVADOS] updated: a0b0947b0ccf23d3e8d7d9e3f7dd41813bf2ee41

[git at public.curoverse.com]

Summary of changes:
 sdk/python/arvados/commands/put.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

       via  a0b0947b0ccf23d3e8d7d9e3f7dd41813bf2ee41 (commit)
      from  1ee96f5e647a85cf2c1040ae04b83fb6ece4372b (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 a0b0947b0ccf23d3e8d7d9e3f7dd41813bf2ee41
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Aug 25 08:51:47 2014 -0400

    With new apiserver, after upload, arv-put prints portable data hash instead of
    collection uuid for compatibility with crunch.  refs #3504

diff --git a/sdk/python/arvados/commands/put.py b/sdk/python/arvados/commands/put.py
index 8cf56b6..7b6b048 100644
--- a/sdk/python/arvados/commands/put.py
+++ b/sdk/python/arvados/commands/put.py
@@ -457,12 +457,16 @@ def main(arguments=None, stdout=sys.stdout, stderr=sys.stderr):
                 },
             ).execute()
 
-        output = collection['uuid']
+        if 'portable_data_hash' in collection and collection['portable_data_hash']:
+            output = collection['portable_data_hash']
+        else:
+            output = collection['uuid']
+
         if project_link is not None:
             # Update collection name
             try:
                 if 'name' in collection:
-                    arvados.api().collections().update(uuid=output,
+                    arvados.api().collections().update(uuid=collection['uuid'],
                                                        body={"name": project_link["name"]}).execute()
                 else:
                     create_project_link(output, project_link)

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


hooks/post-receive
--