From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Thu, 4 Sep 2014 14:51:04 +0000 (-0400)
Subject: 3644: Tweak CollectionReader manifest text regular expression to use multiline
X-Git-Tag: 1.1.0~2223^2~11
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/0abff82784887a0d8d8f6f4b67972296a2aa7728

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 a86a1f512c..a06a17faee 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+)+\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: