Modified: CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py (4351 => 4352)
--- CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py 2009-06-17 16:50:59 UTC (rev 4351)
+++ CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py 2009-06-17 18:49:18 UTC (rev 4352)
@@ -293,12 +293,9 @@
self.shortNames.append(child.firstChild.data.encode("utf-8"))
elif child_name == ELEMENT_GUID:
if child.firstChild is not None:
- guid = child.firstChild.data.encode("utf-8")
- try:
- UUID(guid)
- except ValueError, e:
- log.error("Invalid GUID (%s) in accounts XML: %r" % (e, guid))
- self.guid = guid
+ self.guid = child.firstChild.data.encode("utf-8")
+ if len(self.guid) < 4:
+ self.guid += "?" * (4 - len(self.guid))
elif child_name == ELEMENT_PASSWORD:
if child.firstChild is not None:
self.password = child.firstChild.data.encode("utf-8")