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

[source_changes at macosforge.org]

Revision: 1794
          http://trac.macosforge.org/projects/calendarserver/changeset/1794
Author:   cdaboo at apple.com
Date:     2007-08-17 12:01:01 -0700 (Fri, 17 Aug 2007)

Log Message:
-----------
No longer need to examine legacy XMLPlist attribute in /Computers record.

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

Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2007-08-17 18:50:19 UTC (rev 1793)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2007-08-17 19:01:01 UTC (rev 1794)
@@ -169,15 +169,9 @@
         for recordname, record in records.iteritems():
             # May have an apple-serviceinfo
             plist = record.get('dsAttrTypeNative:apple-serviceinfo', None)
-
             if not plist:
-                # May have XMLPlist value
-                plist = record.get(dsattributes.kDS1AttrXMLPlist, None)
+                continue
 
-                # Must have one of the other
-                if not plist:
-                    continue
-
             # XXX: Parse the plist so we can find only calendar vhosts with our hostname.
             plistDict = readPlistFromString(plist)
             vhosts = plistDict.get("com.apple.macosxserver.virtualhosts", None)

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