3644: Tweak CollectionReader manifest text regular expression to use multiline

match.

diff --git a/sdk/python/arvados/collection.py b/sdk/python/arvados/collection.py
index a86a1f512c5c6725100ff5ba63923a9243158ab8..a06a17faeeb051e0edeee277535c9b8d969db9ce 100644 (file)
--- 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+)+\n', manifest_locator_or_text):
+        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: