[ARVADOS] updated: accaf5ae43696ec8462e0f204a41125e14cefbc0

[git at public.curoverse.com]

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

       via  accaf5ae43696ec8462e0f204a41125e14cefbc0 (commit)
       via  3bd1f8dad3a4c9abd6130c66a4cefc973398a09d (commit)
      from  00dd253443e7f7a94bdea1a349627ebd95f296fd (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 accaf5ae43696ec8462e0f204a41125e14cefbc0
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Aug 18 13:23:03 2014 -0400

    Do not try to predict uuid of new collection. refs #3261 refs #3504

diff --git a/sdk/python/arvados/commands/put.py b/sdk/python/arvados/commands/put.py
index d3efa63..335ef17 100644
--- a/sdk/python/arvados/commands/put.py
+++ b/sdk/python/arvados/commands/put.py
@@ -447,7 +447,6 @@ def main(arguments=None, stdout=sys.stdout, stderr=sys.stderr):
         # Register the resulting collection in Arvados.
         collection = arvados.api().collections().create(
             body={
-                'uuid': writer.finish(),
                 'manifest_text': writer.manifest_text(),
                 },
             ).execute()

commit 3bd1f8dad3a4c9abd6130c66a4cefc973398a09d
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Aug 18 13:15:13 2014 -0400

    Do not throw away permission hints when writing data. refs #3261

diff --git a/sdk/python/arvados/collection.py b/sdk/python/arvados/collection.py
index 6cf4d07..7aed681 100644
--- a/sdk/python/arvados/collection.py
+++ b/sdk/python/arvados/collection.py
@@ -314,8 +314,8 @@ class CollectionWriter(object):
                  self._current_file_pos,
                  self._current_stream_name))
         self._current_stream_files += [[self._current_file_pos,
-                                       self._current_stream_length - self._current_file_pos,
-                                       self._current_file_name]]
+                                        self._current_stream_length - self._current_file_pos,
+                                        self._current_file_name]]
         self._current_file_pos = self._current_stream_length
 
     def start_new_stream(self, newstreamname='.'):
@@ -344,8 +344,8 @@ class CollectionWriter(object):
             if len(self._current_stream_locators) == 0:
                 self._current_stream_locators += [config.EMPTY_BLOCK_LOCATOR]
             self._finished_streams += [[self._current_stream_name,
-                                       self._current_stream_locators,
-                                       self._current_stream_files]]
+                                        self._current_stream_locators,
+                                        self._current_stream_files]]
         self._current_stream_files = []
         self._current_stream_length = 0
         self._current_stream_locators = []
@@ -354,9 +354,8 @@ class CollectionWriter(object):
         self._current_file_name = None
 
     def finish(self):
-        # Send the stripped manifest to Keep, to ensure that we use the
-        # same UUID regardless of what hints are used on the collection.
-        return Keep.put(self.stripped_manifest())
+        # Store the manifest in Keep and return its locator.
+        return Keep.put(self.manifest_text())
 
     def stripped_manifest(self):
         """

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


hooks/post-receive
--