[CalendarServer-changes] [7191] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 7191
          http://trac.macosforge.org/projects/calendarserver/changeset/7191
Author:   cdaboo at apple.com
Date:     2011-03-14 08:18:24 -0700 (Mon, 14 Mar 2011)
Log Message:
-----------
Properly handle \n in ADR property value.

Modified Paths:
--------------
    CalendarServer/trunk/lib-patches/vobject/vobject.icalendar.patch
    CalendarServer/trunk/support/patchapply

Modified: CalendarServer/trunk/lib-patches/vobject/vobject.icalendar.patch
===================================================================
--- CalendarServer/trunk/lib-patches/vobject/vobject.icalendar.patch	2011-03-14 15:16:35 UTC (rev 7190)
+++ CalendarServer/trunk/lib-patches/vobject/vobject.icalendar.patch	2011-03-14 15:18:24 UTC (rev 7191)
@@ -21,16 +21,19 @@
      if charList is None:
          charList = escapableCharList
  
-@@ -1656,6 +1660,8 @@
+@@ -1655,7 +1659,10 @@
+ 
          if state == "read normal":
              if char == '\\':
-                 state = "read escaped char"
+-                state = "read escaped char"
 +                if leaveEscapes:
 +                    current.append(char)
++                else:
++                    state = "read escaped char"
              elif char == listSeparator:
                  state = "read normal"
                  current = "".join(current)
-@@ -1675,9 +1681,10 @@
+@@ -1675,9 +1682,10 @@
                  else:
                      current.append(char)
              else:

Modified: CalendarServer/trunk/support/patchapply
===================================================================
--- CalendarServer/trunk/support/patchapply	2011-03-14 15:16:35 UTC (rev 7190)
+++ CalendarServer/trunk/support/patchapply	2011-03-14 15:18:24 UTC (rev 7191)
@@ -24,7 +24,7 @@
 #
 
 #projects = ("Twisted", "vobject", "dateutil", "xattr")
-projects = ("Twisted", "vobject",)
+projects = ("vobject",)
 cwd = os.getcwd()
 libpatches = os.path.join(cwd, "lib-patches")
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110314/ddf5ea33/attachment.html>