Revision: 8193
http://trac.macosforge.org/projects/calendarserver/changeset/8193
Author: sagen at apple.com
Date: 2011-10-14 12:09:09 -0700 (Fri, 14 Oct 2011)
Log Message:
-----------
ResourceInfo comes back from OD as a list
Modified Paths:
--------------
CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2011-10-14 17:49:25 UTC (rev 8192)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2011-10-14 19:09:09 UTC (rev 8193)
@@ -970,8 +970,10 @@
recordGUID = value.get(dsattributes.kDS1AttrGeneratedUID)
resourceInfo = value.get(dsattributes.kDSNAttrResourceInfo)
if resourceInfo is not None:
+ if type(resourceInfo) is not str:
+ resourceInfo = resourceInfo[0]
try:
- autoSchedule, proxy, readOnlyProxy = self._parseResourceInfo(resourceInfo,
+ autoSchedule, proxy, readOnlyProxy = self.parseResourceInfo(resourceInfo,
recordGUID, recordType, recordShortName)
except ValueError:
continue
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111014/13aa0c66/attachment.html>