[CalendarServer-changes] [6296] CalendarServer/trunk/txdav/base/propertystore/xattr.py

[source_changes at macosforge.org]

Revision: 6296
          http://trac.macosforge.org/projects/calendarserver/changeset/6296
Author:   cdaboo at apple.com
Date:     2010-09-15 13:02:02 -0700 (Wed, 15 Sep 2010)
Log Message:
-----------
For backwards compatibility we need the default users per-user id to be empty when writing to xattr.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/base/propertystore/xattr.py

Modified: CalendarServer/trunk/txdav/base/propertystore/xattr.py
===================================================================
--- CalendarServer/trunk/txdav/base/propertystore/xattr.py	2010-09-15 19:47:08 UTC (rev 6295)
+++ CalendarServer/trunk/txdav/base/propertystore/xattr.py	2010-09-15 20:02:02 UTC (rev 6296)
@@ -114,7 +114,7 @@
         qname, uid = effective
         namespace = self._namespaceCompress.get(qname.namespace, qname.namespace) if compressNamespace else qname.namespace
         result = urllib.quote("{%s}%s" % (namespace, qname.name), safe="{}:")
-        if uid:
+        if uid and uid != self._defaultuser:
             result = uid + result
         r = self.deadPropertyXattrPrefix + result
         return r
@@ -129,7 +129,7 @@
         if (index1 is - 1 or index2 is - 1 or not len(name) > index2):
             raise ValueError("Invalid encoded name: %r" % (name,))
         if index1 == 0:
-            uid = None
+            uid = self._defaultuser
         else:
             uid = name[:index1]
         propnamespace = name[index1 + 1:index2]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100915/709047c2/attachment.html>