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

[source_changes at macosforge.org]

Revision: 4260
          http://trac.macosforge.org/projects/calendarserver/changeset/4260
Author:   sagen at apple.com
Date:     2009-05-14 11:49:06 -0700 (Thu, 14 May 2009)
Log Message:
-----------
Log an error if duplicate GUIDs are found in opendirectory

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

Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2009-05-14 17:22:58 UTC (rev 4259)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2009-05-14 18:49:06 UTC (rev 4260)
@@ -687,6 +687,10 @@
             record = enabledRecords[0]
         elif len(enabledRecords) == 0 and len(disabledRecords) == 1:
             record = disabledRecords[0]
+        elif indexType == self.INDEX_TYPE_GUID and len(enabledRecords) > 1:
+            self.log_error("Duplicate records found for GUID %s:" % (indexKey,))
+            for record in enabledRecords:
+                self.log_error("Duplicate: %s" % (", ".join(record.shortNames)))
 
         if record:
             self.log_debug("Storing (%s %s) %s in internal cache" % (indexType, origIndexKey, record))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090514/66ca7a24/attachment-0001.html>