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

source_changes at macosforge.org source_changes at macosforge.org
Fri Nov 20 08:27:20 PST 2009


Revision: 4786
          http://trac.macosforge.org/projects/calendarserver/changeset/4786
Author:   cdaboo at apple.com
Date:     2009-11-20 08:27:16 -0800 (Fri, 20 Nov 2009)
Log Message:
-----------
Make sure proxy principals show as unique.

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

Modified: CalendarServer/branches/users/cdaboo/deployment-partition-4722/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/branches/users/cdaboo/deployment-partition-4722/twistedcaldav/directory/principal.py	2009-11-20 15:33:04 UTC (rev 4785)
+++ CalendarServer/branches/users/cdaboo/deployment-partition-4722/twistedcaldav/directory/principal.py	2009-11-20 16:27:16 UTC (rev 4786)
@@ -576,6 +576,13 @@
 
             proxyFors.update(proxies)
 
+        uids = set()
+        for principal in tuple(proxyFors):
+            if principal.principalUID() in uids:
+                proxyFors.remove(principal)
+            else:
+                uids.add(principal.principalUID())
+
         yield proxyFors
 
     def principalCollections(self):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091120/f26a94a3/attachment.html>


More information about the calendarserver-changes mailing list