[CalendarServer-changes] [1634] CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py

[source_changes at macosforge.org]

Revision: 1634
          http://trac.macosforge.org/projects/calendarserver/changeset/1634
Author:   wsanchez at apple.com
Date:     2007-06-29 15:01:47 -0700 (Fri, 29 Jun 2007)

Log Message:
-----------
Use a different GUID for proxy principals as from their primary principals.

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

Modified: CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py	2007-06-29 21:19:41 UTC (rev 1633)
+++ CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py	2007-06-29 22:01:47 UTC (rev 1634)
@@ -38,6 +38,7 @@
 from twistedcaldav.extensions import ReadOnlyWritePropertiesResourceMixIn
 from twistedcaldav.sql import AbstractSQLDatabase
 from twistedcaldav.static import AutoProvisioningFileMixIn
+from twistedcaldav.directory.util import uuidFromName
 
 import os
 
@@ -97,7 +98,7 @@
         self._url = joinURL(parent.principalURL(), proxyType)
         if self.isCollection():
             self._url += "/"
-        self.guid = self.parent.principalUID() + "-" + proxyType
+        self.guid = uuidFromName(self.parent.principalUID(), proxyType)
 
         # Provision in __init__() because principals are used prior to request
         # lookups.
@@ -202,7 +203,7 @@
                 """<pre><blockquote>"""
                 """Directory Information\n"""
                 """---------------------\n"""
-                """Parent Directory GUID: %s\n"""  % (self.parent.record.service.guid,),
+                """Directory GUID: %s\n"""         % (self.parent.record.service.guid,),
                 """Realm: %s\n"""                  % (self.parent.record.service.realmName,),
                 """\n"""
                 """Parent Principal Information\n"""
@@ -216,6 +217,7 @@
                 """\n"""
                 """Proxy Principal Information\n"""
                 """---------------------\n"""
+                """GUID: %s\n"""                   % (self.guid,),
                 """Principal UID: %s\n"""          % (self.principalUID(),),
                 """Principal URL: %s\n"""          % (link(self.principalURL()),),
                 """\nAlternate URIs:\n"""          , format_list(self.alternateURIs()),

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