[CalendarServer-changes] [6438] CalendarServer/branches/users/glyph/more-deferreds-7/twext/web2/dav/ resource.py

[source_changes at macosforge.org]

Revision: 6438
          http://trac.macosforge.org/projects/calendarserver/changeset/6438
Author:   glyph at apple.com
Date:     2010-10-18 10:19:58 -0700 (Mon, 18 Oct 2010)
Log Message:
-----------
propagate a few more write return values

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/more-deferreds-7/twext/web2/dav/resource.py

Modified: CalendarServer/branches/users/glyph/more-deferreds-7/twext/web2/dav/resource.py
===================================================================
--- CalendarServer/branches/users/glyph/more-deferreds-7/twext/web2/dav/resource.py	2010-10-18 16:39:08 UTC (rev 6437)
+++ CalendarServer/branches/users/glyph/more-deferreds-7/twext/web2/dav/resource.py	2010-10-18 17:19:58 UTC (rev 6438)
@@ -1082,6 +1082,7 @@
         """
         self.writeDeadProperty(acl)
 
+
     @inlineCallbacks
     def mergeAccessControlList(self, new_acl, request):
         """
@@ -1245,9 +1246,10 @@
         # FIXME: verify acl is self-consistent
 
         # Step 11
-        self.writeNewACEs(new_set)
+        yield self.writeNewACEs(new_set)
         returnValue(None)
-        
+
+
     def writeNewACEs(self, new_aces):
         """
         Write a new ACL to the resource's property store.  This is a
@@ -1256,8 +1258,9 @@
         command.
         @param new_aces: C{list} of L{ACE} for ACL being set.
         """
-        self.setAccessControlList(davxml.ACL(*new_aces))
+        return self.setAccessControlList(davxml.ACL(*new_aces))
 
+
     def matchPrivilege(self, privilege, ace_privileges, supportedPrivileges):
         for ace_privilege in ace_privileges:
             if (
@@ -1268,6 +1271,7 @@
 
         return False
 
+
     @inlineCallbacks
     def checkPrivileges(
         self, request, privileges, recurse=False,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101018/46b96778/attachment.html>