[CalendarServer-changes] [4696] CalendarServer/branches/more-deferreds-4/lib-patches/Twisted/twisted .web2.dav.resource.patch

[source_changes at macosforge.org]

Revision: 4696
          http://trac.macosforge.org/projects/calendarserver/changeset/4696
Author:   glyph at apple.com
Date:     2009-11-02 14:47:55 -0800 (Mon, 02 Nov 2009)
Log Message:
-----------
propagate potential Deferreds through setAccessControlList

Modified Paths:
--------------
    CalendarServer/branches/more-deferreds-4/lib-patches/Twisted/twisted.web2.dav.resource.patch

Modified: CalendarServer/branches/more-deferreds-4/lib-patches/Twisted/twisted.web2.dav.resource.patch
===================================================================
--- CalendarServer/branches/more-deferreds-4/lib-patches/Twisted/twisted.web2.dav.resource.patch	2009-11-02 22:47:18 UTC (rev 4695)
+++ CalendarServer/branches/more-deferreds-4/lib-patches/Twisted/twisted.web2.dav.resource.patch	2009-11-02 22:47:55 UTC (rev 4696)
@@ -350,12 +350,21 @@
          yield None
  
      mergeAccessControlList = deferredGenerator(mergeAccessControlList)
+@@ -939,7 +987,7 @@
+         via the ACL 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:
 @@ -1089,7 +1137,9 @@
              return url
  
          try:
 -            acl = self.readDeadProperty(davxml.ACL)
-+            acl = waitForDeferred(self.readDeadProperty(davxml.ACL))
++            acl = waitForDeferred(maybeDeferred(self.readDeadProperty, davxml.ACL))
 +            yield acl
 +            acl = acl.getResult()
          except HTTPError, e:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091102/6466cac4/attachment.html>