[ARVADOS] updated: 90620c81acd7ef143fe6879c28751584a25f5ce5

[Git user]

Summary of changes:
 sdk/python/arvados/collection.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

       via  90620c81acd7ef143fe6879c28751584a25f5ce5 (commit)
      from  f64b139b96c3d79ad5fa1e6ea3a5ff06f3670cf9 (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 90620c81acd7ef143fe6879c28751584a25f5ce5
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Sep 16 11:05:48 2016 -0400

    10014: Add error details. Use filesystem language ("directory") instead of "subcollection".

diff --git a/sdk/python/arvados/collection.py b/sdk/python/arvados/collection.py
index dbeee34..27aad03 100644
--- a/sdk/python/arvados/collection.py
+++ b/sdk/python/arvados/collection.py
@@ -307,7 +307,8 @@ class CollectionWriter(CollectionBase):
     def set_current_stream_name(self, newstreamname):
         if re.search(r'[\t\n]', newstreamname):
             raise errors.AssertionError(
-                "Manifest stream names cannot contain whitespace")
+                "Manifest stream names cannot contain whitespace: '%s'" %
+                (newstreamname))
         self._current_stream_name = '.' if newstreamname=='' else newstreamname
 
     def current_stream_name(self):
@@ -735,7 +736,7 @@ class RichCollectionBase(CollectionBase):
             raise IOError(errno.ENOENT, "File not found", path)
         if len(pathcomponents) == 1:
             if isinstance(self._items[pathcomponents[0]], RichCollectionBase) and len(self._items[pathcomponents[0]]) > 0 and not recursive:
-                raise IOError(errno.ENOTEMPTY, "Subcollection not empty", path)
+                raise IOError(errno.ENOTEMPTY, "Directory not empty", path)
             deleteditem = self._items[pathcomponents[0]]
             del self._items[pathcomponents[0]]
             self._committed = False

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


hooks/post-receive
--