[CalendarServer-changes] [6379] CalendarServer/trunk/twistedcaldav
source_changes at macosforge.org
source_changes at macosforge.org
Tue Sep 28 09:58:32 PDT 2010
Revision: 6379
http://trac.macosforge.org/projects/calendarserver/changeset/6379
Author: sagen at apple.com
Date: 2010-09-28 09:58:31 -0700 (Tue, 28 Sep 2010)
Log Message:
-----------
Go back to the old proxy DB "TYPE" of "CALENDARUSERPROXY" so that an upgrade does not have to manipulate the proxydb file contents.
Modified Paths:
--------------
CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py
CalendarServer/trunk/twistedcaldav/upgrade.py
Modified: CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py 2010-09-28 03:08:35 UTC (rev 6378)
+++ CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py 2010-09-28 16:58:31 UTC (rev 6379)
@@ -365,7 +365,7 @@
"""
schema_version = "4"
- schema_type = "ProxyDB"
+ schema_type = "CALENDARUSERPROXY"
class ProxyDBMemcacher(Memcacher):
Modified: CalendarServer/trunk/twistedcaldav/upgrade.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/upgrade.py 2010-09-28 03:08:35 UTC (rev 6378)
+++ CalendarServer/trunk/twistedcaldav/upgrade.py 2010-09-28 16:58:31 UTC (rev 6379)
@@ -465,6 +465,17 @@
def upgrade_to_2(config):
#
+ # Rename proxy DB
+ #
+ oldFilename = "calendaruserproxy.sqlite"
+ newFilename = "proxies.sqlite"
+
+ oldDbPath = os.path.join(config.DataRoot, oldFilename)
+ newDbPath = os.path.join(config.DataRoot, newFilename)
+ if os.path.exists(oldDbPath) and not os.path.exists(newDbPath):
+ os.rename(oldDbPath, newDbPath)
+
+ #
# Migrates locations and resources from OD
#
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100928/ea0f9748/attachment.html>
More information about the calendarserver-changes
mailing list