Modified: CalendarServer/branches/users/wsanchez/dropbox/twistedcaldav/dropbox.py (805 => 806)
--- CalendarServer/branches/users/wsanchez/dropbox/twistedcaldav/dropbox.py 2006-12-12 15:36:41 UTC (rev 805)
+++ CalendarServer/branches/users/wsanchez/dropbox/twistedcaldav/dropbox.py 2006-12-12 17:06:56 UTC (rev 806)
@@ -79,7 +79,9 @@
if TwistedACLInheritable() not in ace.children:
children = list(ace.children)
children.append(TwistedACLInheritable())
- edited_aces.append(davxml.ACE(children))
+ edited_aces.append(davxml.ACE(*children))
+ else:
+ edited_aces.append(ace)
# Do inherited with possibly modified set of aces
super(DropBoxCollectionResource, self).writeNewACEs(edited_aces)
Modified: CalendarServer/branches/users/wsanchez/dropbox/twistedcaldav/resource.py (805 => 806)
--- CalendarServer/branches/users/wsanchez/dropbox/twistedcaldav/resource.py 2006-12-12 15:36:41 UTC (rev 805)
+++ CalendarServer/branches/users/wsanchez/dropbox/twistedcaldav/resource.py 2006-12-12 17:06:56 UTC (rev 806)
@@ -454,7 +454,9 @@
if TwistedACLInheritable() not in ace.children:
children = list(ace.children)
children.append(TwistedACLInheritable())
- edited_aces.append(davxml.ACE(children))
+ edited_aces.append(davxml.ACE(*children))
+ else:
+ edited_aces.append(ace)
else:
edited_aces = newaces