[CalendarServer-changes] [4778] CalendarServer/branches/users/cdaboo/deployment-partition-4722/ twistedcaldav/directory/directory.py

[source_changes at macosforge.org]

Revision: 4778
          http://trac.macosforge.org/projects/calendarserver/changeset/4778
Author:   cdaboo at apple.com
Date:     2009-11-19 07:52:32 -0800 (Thu, 19 Nov 2009)
Log Message:
-----------
Don't raise when a group is marked as enabled for calendaring. Simply turn the option off an continue.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/deployment-partition-4722/twistedcaldav/directory/directory.py

Modified: CalendarServer/branches/users/cdaboo/deployment-partition-4722/twistedcaldav/directory/directory.py
===================================================================
--- CalendarServer/branches/users/cdaboo/deployment-partition-4722/twistedcaldav/directory/directory.py	2009-11-18 23:20:32 UTC (rev 4777)
+++ CalendarServer/branches/users/cdaboo/deployment-partition-4722/twistedcaldav/directory/directory.py	2009-11-19 15:52:32 UTC (rev 4778)
@@ -214,7 +214,8 @@
             self.calendarUserAddresses = set(augment.calendarUserAddresses)
 
             if self.enabledForCalendaring and self.recordType == self.service.recordType_groups:
-                raise AssertionError("Groups may not be enabled for calendaring")
+                self.log_error("Group '%s(%s)' cannot be enabled for calendaring" % (self.guid, self.shortName,))
+                self.enabledForCalendaring = False
     
             if self.enabledForCalendaring:
                 for email in self.emailAddresses:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091119/c078e634/attachment.html>