[CalendarServer-changes] [9404] CalendarServer/branches/release/CalendarServer-4.1-dev/contrib/ migration/calendarmigrator.py

[source_changes at macosforge.org]

Revision: 9404
          http://trac.macosforge.org/projects/calendarserver/changeset/9404
Author:   sagen at apple.com
Date:     2012-07-03 07:24:42 -0700 (Tue, 03 Jul 2012)
Log Message:
-----------
Pulling rev 9403 from trunk to fix TM restore issue

Revision Links:
--------------
    http://trac.macosforge.org/projects/calendarserver/changeset/9403

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-4.1-dev/contrib/migration/calendarmigrator.py

Modified: CalendarServer/branches/release/CalendarServer-4.1-dev/contrib/migration/calendarmigrator.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-4.1-dev/contrib/migration/calendarmigrator.py	2012-07-03 05:05:00 UTC (rev 9403)
+++ CalendarServer/branches/release/CalendarServer-4.1-dev/contrib/migration/calendarmigrator.py	2012-07-03 14:24:42 UTC (rev 9404)
@@ -651,8 +651,8 @@
         # Before 10.8, DocumentRoot and DataRoot were relative to ServerRoot
 
         if oldServerRootValue:
-            if diskAccessor.exists(oldServerRootValue): # external volume
-                log("Using external calendar server root: %s" % (newServerRoot,))
+            if oldServerRootValue.rstrip("/") != NEW_SERVER_ROOT: # external volume
+                log("Using external calendar server root: %s" % (oldServerRootValue,))
                 # ServerRoot needs to be /Library/Server/Calendar and Contacts
                 # Since DocumentRoot is now relative to DataRoot, move DocumentRoot into DataRoot
                 newDataRoot = newDataRootValue = os.path.join(oldServerRootValue, "Data")
@@ -699,7 +699,7 @@
     else: # 10.8 -> 10.8
 
         if oldServerRootValue:
-            if diskAccessor.exists(oldServerRootValue): # external volume
+            if oldServerRootValue.rstrip("/") != NEW_SERVER_ROOT: # external volume
                 log("Using external calendar server root: %s" % (oldServerRootValue,))
             elif diskAccessor.exists(absolutePathWithRoot(sourceRoot, oldServerRootValue)):
                 log("Copying calendar server root: %s" % (newServerRoot,))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120703/9b03ef74/attachment.html>