[CalendarServer-dev] [CalendarServer-changes] [4352] CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py

Wilfredo Sánchez Vega wsanchez at wsanchez.net
Wed Jun 17 16:17:20 PDT 2009


   A GUID is a UUID.

   The correct fix here is to change the <guid> element to <uid> and  
have it set self.uid instead of self.guid.

   As long as you are setting self.guid, that error message is valid.

	-wsv


On Jun 17, 2009, at 11:49 AM, source_changes at macosforge.org wrote:

> Revision
> 4352
> Author
> cdaboo at apple.com
> Date
> 2009-06-17 11:49:18 -0700 (Wed, 17 Jun 2009)
> Log Message
>
> Suppress the invalid UUID warning - it is not a UUID it is a GUID.
> Modified Paths
>
> CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py
> Diff
>
> 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")
> _______________________________________________
> calendarserver-changes mailing list
> calendarserver-changes at lists.macosforge.org
> http://lists.macosforge.org/mailman/listinfo.cgi/calendarserver- 
> changes

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-dev/attachments/20090617/2c3ca5f9/attachment.html>


More information about the calendarserver-dev mailing list