[ARVADOS] updated: c78412ea3d188e3e035b285d10f89cf592b21071

[git at public.curoverse.com]

Summary of changes:
 sdk/python/arvados/collection.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  c78412ea3d188e3e035b285d10f89cf592b21071 (commit)
      from  ac594f16176901b7692be354045226e093b14218 (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 c78412ea3d188e3e035b285d10f89cf592b21071
Author: Tim Pierce <twp at unchi.org>
Date:   Fri Sep 12 15:18:15 2014 -0400

    Bug fix: manifests with extra spaces
    
    Extend the regular expression to match manifest_text to permit more than
    a single space in manifest entries (seen in e.g. 91534558193f42a2f7f8aca872e5a78d+15723)
    
    No issue #

diff --git a/sdk/python/arvados/collection.py b/sdk/python/arvados/collection.py
index 686d694..f5c4066 100644
--- a/sdk/python/arvados/collection.py
+++ b/sdk/python/arvados/collection.py
@@ -101,7 +101,7 @@ class CollectionReader(object):
         elif re.match(r'[a-z0-9]{5}-[a-z0-9]{5}-[a-z0-9]{15}$', manifest_locator_or_text):
             self._manifest_locator = manifest_locator_or_text
             self._manifest_text = None
-        elif re.match(r'((\S+)( [a-f0-9]{32}(\+\d+)(\+\S+)*)+( \d+:\d+:\S+)+$)+', manifest_locator_or_text, re.MULTILINE):
+        elif re.match(r'((\S+)( +[a-f0-9]{32}(\+\d+)(\+\S+)*)+( +\d+:\d+:\S+)+$)+', manifest_locator_or_text, re.MULTILINE):
             self._manifest_text = manifest_locator_or_text
             self._manifest_locator = None
         else:

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


hooks/post-receive
--