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

[source_changes at macosforge.org]

Revision: 1187
          http://trac.macosforge.org/projects/calendarserver/changeset/1187
Author:   cdaboo at apple.com
Date:     2007-02-14 08:32:03 -0800 (Wed, 14 Feb 2007)

Log Message:
-----------
Ignore %(principaluri)s in calendar user address template as server automatically adds those.

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

Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2007-02-14 16:16:11 UTC (rev 1186)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2007-02-14 16:32:03 UTC (rev 1187)
@@ -304,6 +304,12 @@
         # Now do substitutions    
         result = set()
         for template in self.cuaddrtemplates:
+            
+            # Ignore %(principaluri)s templates as we already default to adding those
+            if template.find("%(principaluri)s") != -1:
+                continue
+
+            # Loop over each host variant
             for scheme, hostname, port in self.hostvariants:
                 for subs in subslist:
                     # Add in host substitution values

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070214/394fa8bd/attachment.html