[ARVADOS] updated: b5a278786165ebbbd63044cf9b5b64b949fe88ed

git at public.curoverse.com git at public.curoverse.com
Fri Aug 15 11:11:12 EDT 2014


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

       via  b5a278786165ebbbd63044cf9b5b64b949fe88ed (commit)
       via  bccccc55105f6b407ad80ea23c53998d968c5524 (commit)
      from  244159419c42341baeb388236ad29cc546b7eca1 (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 b5a278786165ebbbd63044cf9b5b64b949fe88ed
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Aug 15 10:06:32 2014 -0400

    gitignore sdk/cli/vendor. refs #3551

diff --git a/.gitignore b/.gitignore
index 9ddcf07..8cc6b89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ sdk/java/target
 apps/workbench/vendor/bundle
 services/api/vendor/bundle
 sdk/java/log
+sdk/cli/vendor

commit bccccc55105f6b407ad80ea23c53998d968c5524
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Aug 15 10:05:01 2014 -0400

    Restore trailing newline in manifest format sanity check.
    
    Amends 3cc80b447efcaf416ea4d6857d6d40583e462ff8
    No issue #

diff --git a/sdk/python/arvados/collection.py b/sdk/python/arvados/collection.py
index 8fdfcf8..6cf4d07 100644
--- a/sdk/python/arvados/collection.py
+++ b/sdk/python/arvados/collection.py
@@ -96,7 +96,7 @@ class CollectionReader(object):
         if re.match(r'[a-f0-9]{32}(\+\d+)?(\+\S+)*$', 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):
+        elif re.match(r'(\S+)( [a-f0-9]{32}(\+\d+)(\+\S+)*)+( \d+:\d+:\S+)+\n', manifest_locator_or_text):
             self._manifest_text = manifest_locator_or_text
             self._manifest_locator = None
         else:

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list