[CalendarServer-changes] [6898] CalendarServer/branches/users/glyph/linux-tests/txdav/base/ propertystore/xattr.py

source_changes at macosforge.org source_changes at macosforge.org
Mon Feb 7 04:39:28 PST 2011


Revision: 6898
          http://trac.macosforge.org/projects/calendarserver/changeset/6898
Author:   glyph at apple.com
Date:     2011-02-07 04:39:28 -0800 (Mon, 07 Feb 2011)
Log Message:
-----------
The only reason this module really exists is for migration, so even though the prefix that was previously assigned on Linux was not really the best, keep using it.

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/linux-tests/txdav/base/propertystore/xattr.py

Modified: CalendarServer/branches/users/glyph/linux-tests/txdav/base/propertystore/xattr.py
===================================================================
--- CalendarServer/branches/users/glyph/linux-tests/txdav/base/propertystore/xattr.py	2011-02-07 12:39:12 UTC (rev 6897)
+++ CalendarServer/branches/users/glyph/linux-tests/txdav/base/propertystore/xattr.py	2011-02-07 12:39:28 UTC (rev 6898)
@@ -36,6 +36,7 @@
 
 from txdav.base.propertystore.base import AbstractPropertyStore, PropertyName, validKey
 from txdav.idav import PropertyStoreError
+from twisted.python.reflect import namedAny
 
 
 #
@@ -61,15 +62,11 @@
 
         http://undefined.org/python/#xattr
     """
-    #
-    # Dead properties are stored as extended attributes on disk.  In order to
-    # avoid conflicts with other attributes, prefix dead property names.
-    #
-    deadPropertyXattrPrefix = "WebDAV:"
 
-    # Linux seems to require that attribute names use a "user." prefix.
-    if sys.platform == "linux2":
-        deadPropertyXattrPrefix = "user." + deadPropertyXattrPrefix
+    # Mimic old xattr-prefix behavior by importing it directly.
+    deadPropertyXattrPrefix = namedAny(
+        "twext.web2.dav.xattrprops.xattrPropertyStore.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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110207/45da48c2/attachment-0001.html>


More information about the calendarserver-changes mailing list