[CalendarServer-changes] [4323] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 4323
          http://trac.macosforge.org/projects/calendarserver/changeset/4323
Author:   wsanchez at apple.com
Date:     2009-06-03 17:48:33 -0700 (Wed, 03 Jun 2009)
Log Message:
-----------
Committed the xattr KeyError fix

Modified Paths:
--------------
    CalendarServer/trunk/run

Removed Paths:
-------------
    CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.xattrprops.patch

Deleted: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.xattrprops.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.xattrprops.patch	2009-06-04 00:43:39 UTC (rev 4322)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.xattrprops.patch	2009-06-04 00:48:33 UTC (rev 4323)
@@ -1,33 +0,0 @@
-Index: twisted/web2/dav/xattrprops.py
-===================================================================
---- twisted/web2/dav/xattrprops.py	(revision 26899)
-+++ twisted/web2/dav/xattrprops.py	(working copy)
-@@ -123,6 +123,10 @@
-         """
-         try:
-             data = self.attrs.get(self._encode(qname))
-+        except KeyError:
-+            raise HTTPError(StatusResponse(
-+                    responsecode.NOT_FOUND,
-+                    "No such property: {%s}%s" % qname))
-         except IOError, e:
-             if e.errno in _ATTR_MISSING:
-                 raise HTTPError(StatusResponse(
-@@ -198,6 +202,8 @@
-         try:
-             try:
-                 self.attrs.remove(key)
-+            except KeyError:
-+                pass
-             except IOError, e:
-                 if e.errno not in _ATTR_MISSING:
-                     raise
-@@ -221,6 +227,8 @@
-         key = self._encode(qname)
-         try:
-             self.attrs.get(key)
-+        except KeyError:
-+            return False
-         except IOError, e:
-             if e.errno in _ATTR_MISSING or e.errno == errno.ENOENT:
-                 return False

Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run	2009-06-04 00:43:39 UTC (rev 4322)
+++ CalendarServer/trunk/run	2009-06-04 00:48:33 UTC (rev 4323)
@@ -656,7 +656,7 @@
     ;;
 esac;
 svn_uri="${proto}://svn.twistedmatrix.com/svn/Twisted/branches/dav-take-two-3081-4";
-svn_get "Twisted" "${twisted}" "${svn_uri}" 26899;
+svn_get "Twisted" "${twisted}" "${svn_uri}" 26969;
 
 # No py_build step, since we tend to do edit Twisted, we want the sources in
 # PYTHONPATH, not a build directory.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090603/2baf4a1b/attachment-0001.html>