[ARVADOS] updated: 09f46cffe7866ab653fe0ae969b766ae1ad26d39

[Git user]

Summary of changes:

  discards  0c7f9737786fd64177f8210585ec620402d0d9b6 (commit)
       via  09f46cffe7866ab653fe0ae969b766ae1ad26d39 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (0c7f9737786fd64177f8210585ec620402d0d9b6)
            \
             N -- N -- N (09f46cffe7866ab653fe0ae969b766ae1ad26d39)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 09f46cffe7866ab653fe0ae969b766ae1ad26d39
Author: Brett Smith <brett at curoverse.com>
Date:   Thu Mar 17 18:03:21 2016 -0400

    7852: Bugfix _filepos tracking in PySDK readline method.
    
    Make sure self._filepos is always in the right position to return
    uncached data before another read method could be called, to avoid
    inconsistent results when interleaving those calls with readline
    calls.

diff --git a/sdk/python/arvados/arvfile.py b/sdk/python/arvados/arvfile.py
index 71af644..b78c63e 100644
--- a/sdk/python/arvados/arvfile.py
+++ b/sdk/python/arvados/arvfile.py
@@ -108,6 +108,7 @@ class ArvadosFileReaderBase(_FileLikeObjectBase):
         cache_pos, cache_data = self._readline_cache
         if self.tell() == cache_pos:
             data = [cache_data]
+            self._filepos += len(cache_data)
         else:
             data = ['']
         data_size = len(data[-1])
@@ -123,6 +124,7 @@ class ArvadosFileReaderBase(_FileLikeObjectBase):
         except ValueError:
             nextline_index = len(data)
         nextline_index = min(nextline_index, size)
+        self._filepos -= len(data) - nextline_index
         self._readline_cache = (self.tell(), data[nextline_index:])
         return data[:nextline_index]
 

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


hooks/post-receive
--