[CalendarServer-changes] [5474] CalendarServer/trunk/twistedcaldav/directory

[source_changes at macosforge.org]

Revision: 5474
          http://trac.macosforge.org/projects/calendarserver/changeset/5474
Author:   sagen at apple.com
Date:     2010-04-12 16:42:53 -0700 (Mon, 12 Apr 2010)
Log Message:
-----------
Suppress error message for groups that are "enabled" because the default augment record said so.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/augment.py
    CalendarServer/trunk/twistedcaldav/directory/directory.py

Modified: CalendarServer/trunk/twistedcaldav/directory/augment.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/augment.py	2010-04-12 22:00:08 UTC (rev 5473)
+++ CalendarServer/trunk/twistedcaldav/directory/augment.py	2010-04-12 23:42:53 UTC (rev 5474)
@@ -82,6 +82,12 @@
             if self._defaultRecord is not None:
                 result = copy.deepcopy(self._defaultRecord)
                 result.uid = uid
+
+                # Mark default-cloned augment records as such so
+                # DirectoryRecord.addAugmentInformation( ) can avoid unneccesary
+                # error messages:
+                result._clonedFromDefault = True
+
         returnValue(result)
 
     @inlineCallbacks

Modified: CalendarServer/trunk/twistedcaldav/directory/directory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/directory.py	2010-04-12 22:00:08 UTC (rev 5473)
+++ CalendarServer/trunk/twistedcaldav/directory/directory.py	2010-04-12 23:42:53 UTC (rev 5474)
@@ -425,9 +425,13 @@
             self.autoSchedule = augment.autoSchedule
 
             if self.enabledForCalendaring and self.recordType == self.service.recordType_groups:
-                self.log_error("Group '%s(%s)' cannot be enabled for calendaring" % (self.guid, self.shortNames[0],))
                 self.enabledForCalendaring = False
 
+                # For augment records cloned from the Default augment record,
+                # don't emit this message:
+                if not getattr(augment, "_clonedFromDefault", False):
+                    self.log_error("Group '%s(%s)' cannot be enabled for calendaring" % (self.guid, self.shortNames[0],))
+
         else:
             # Groups are by default always enabled
             self.enabled = (self.recordType == self.service.recordType_groups)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100412/be9928a2/attachment-0001.html>