[CalendarServer-changes] [2548] CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py

[source_changes at macosforge.org]

Revision: 2548
          http://trac.macosforge.org/projects/calendarserver/changeset/2548
Author:   wsanchez at apple.com
Date:     2008-06-06 12:34:34 -0700 (Fri, 06 Jun 2008)

Log Message:
-----------
Note reason for mismatch

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

Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2008-06-06 17:24:38 UTC (rev 2547)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2008-06-06 19:34:34 UTC (rev 2548)
@@ -570,7 +570,7 @@
             )
 
             def disableRecord(record):
-                self.log_warn("Record disabled due to conflict: %s" % (record,))
+                self.log_warn("Record disabled due to conflict (record name and GUID must match): %s" % (record,))
 
                 shortName = record.shortName
                 guid      = record.guid

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080606/020294d2/attachment-0001.htm