[ARVADOS] created: 3107d80e87c4fd8a4c6f6e06d9a22537bc1f19b0

git at public.curoverse.com git at public.curoverse.com
Fri May 30 11:06:28 EDT 2014


        at  3107d80e87c4fd8a4c6f6e06d9a22537bc1f19b0 (commit)


commit 3107d80e87c4fd8a4c6f6e06d9a22537bc1f19b0
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri May 30 11:06:17 2014 -0400

    2755: Let the API server decide the correct collection UUID format.

diff --git a/sdk/python/bin/arv-put b/sdk/python/bin/arv-put
index 241ac93..39b6b1a 100755
--- a/sdk/python/bin/arv-put
+++ b/sdk/python/bin/arv-put
@@ -203,25 +203,13 @@ elif args.raw:
     writer.finish_current_stream()
     print string.join(writer.data_locators(), ',')
 else:
-    manifest_locator = writer.finish()
-
-    # The manifest locator is also used as its UUID.  Remove any
-    # signature Keep may have added to the locator; it should not be
-    # considered part of the UUID and will confuse apiserver if the
-    # signature is passed to arvados.api().collections().get().
-    # apiserver will resolve permissions by checking permission links
-    # anyway.
-    # TODO(twp,tomclegg): re-evaluate the value of storing manifests
-    # in Keep at all.
-    manifest_uuid = re.sub(r'\+A[a-z0-9 at _-]+', '', manifest_locator)
-
     # Register the resulting collection in Arvados.
-    arvados.api().collections().create(
+    collection = arvados.api().collections().create(
         body={
-            'uuid': manifest_uuid,
+            'uuid': writer.finish(),
             'manifest_text': writer.manifest_text(),
             },
         ).execute()
 
     # Print the locator (uuid) of the new collection.
-    print manifest_uuid
+    print collection['uuid']

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list