[CalendarServer-changes] [6678] CalendarServer/trunk/contrib/migration/calendarmigrator.py

[source_changes at macosforge.org]

Revision: 6678
          http://trac.macosforge.org/projects/calendarserver/changeset/6678
Author:   sagen at apple.com
Date:     2010-12-09 09:59:29 -0800 (Thu, 09 Dec 2010)
Log Message:
-----------
Make sure Documents directory exists before migrating

Modified Paths:
--------------
    CalendarServer/trunk/contrib/migration/calendarmigrator.py

Modified: CalendarServer/trunk/contrib/migration/calendarmigrator.py
===================================================================
--- CalendarServer/trunk/contrib/migration/calendarmigrator.py	2010-12-08 18:56:09 UTC (rev 6677)
+++ CalendarServer/trunk/contrib/migration/calendarmigrator.py	2010-12-09 17:59:29 UTC (rev 6678)
@@ -579,17 +579,18 @@
         if calendarDataInDefaultLocation:
             # We're in the default location, relocate to new location
             newCalDocuments = os.path.join(newServerRoot, "Documents")
+            if not os.path.exists(newCalDocuments):
+                os.mkdir(newCalDocuments)
             newCalData = os.path.join(newServerRoot, "Data")
+            if not os.path.exists(newCalData):
+                os.mkdir(newCalData)
             if os.path.exists(oldCalDocuments):
-                if os.path.exists(newCalDocuments):
-                    # Move evertying from oldCalDocuments
-                    for item in list(os.listdir(oldCalDocuments)):
-                        source = os.path.join(oldCalDocuments, item)
-                        dest = os.path.join(newCalDocuments, item)
-                        log("Relocating %s to %s" % (source, dest))
-                        os.rename(source, dest)
-                else:
-                    log("Error: %s does not exist" % (newCalDocuments,))
+                # Move evertying from oldCalDocuments
+                for item in list(os.listdir(oldCalDocuments)):
+                    source = os.path.join(oldCalDocuments, item)
+                    dest = os.path.join(newCalDocuments, item)
+                    log("Relocating %s to %s" % (source, dest))
+                    os.rename(source, dest)
             else:
                 log("Warning: %s does not exist; nothing to migrate" % (oldCalDocuments,))
         else:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101209/b936d8ce/attachment.html>