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

source_changes at macosforge.org source_changes at macosforge.org
Thu Dec 9 17:04:51 PST 2010


Revision: 6681
          http://trac.macosforge.org/projects/calendarserver/changeset/6681
Author:   wsanchez at apple.com
Date:     2010-12-09 17:04:48 -0800 (Thu, 09 Dec 2010)
Log Message:
-----------
deadPropertyXattrPrefix on Linux should include "WebDAV:" so as to separate the namespace from user xattrs.
Ignore keys that don't start with self.deadPropertyXattrPrefix.

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-12-09 22:53:03 UTC (rev 6680)
+++ CalendarServer/trunk/txdav/base/propertystore/xattr.py	2010-12-10 01:04:48 UTC (rev 6681)
@@ -69,7 +69,7 @@
 
     # Linux seems to require that attribute names use a "user." prefix.
     if sys.platform == "linux2":
-        deadPropertyXattrPrefix = "user."
+        deadPropertyXattrPrefix = "user." + deadPropertyXattrPrefix
 
     # There is a 127 character limit for xattr keys so we need to compress/expand
     # overly long namespaces to help stay under that limit now that GUIDs are also
@@ -249,6 +249,8 @@
             iterattr = iter(())
 
         for key in iterattr:
+            if not key.startswith(self.deadPropertyXattrPrefix):
+                continue
             effectivekey = self._decodeKey(key)
             if effectivekey[1] == uid and effectivekey not in self.removed:
                 seen.add(effectivekey)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101209/85c94f34/attachment.html>


More information about the calendarserver-changes mailing list