[CalendarServer-changes] [4179] CalendarServer/trunk/contrib/migration/59_calendarmigrator.py

[source_changes at macosforge.org]

Revision: 4179
          http://trac.macosforge.org/projects/calendarserver/changeset/4179
Author:   sagen at apple.com
Date:     2009-05-05 13:36:43 -0700 (Tue, 05 May 2009)
Log Message:
-----------
Only recreate symlink if there isn't already a similarly named file/directory in new directory

Modified Paths:
--------------
    CalendarServer/trunk/contrib/migration/59_calendarmigrator.py

Modified: CalendarServer/trunk/contrib/migration/59_calendarmigrator.py
===================================================================
--- CalendarServer/trunk/contrib/migration/59_calendarmigrator.py	2009-05-05 20:29:36 UTC (rev 4178)
+++ CalendarServer/trunk/contrib/migration/59_calendarmigrator.py	2009-05-05 20:36:43 UTC (rev 4179)
@@ -133,7 +133,7 @@
             oldPath = os.path.join(oldConfigDir, name)
             newPath = os.path.join(newConfigDir, name)
 
-            if os.path.islink(oldPath):
+            if os.path.islink(oldPath) and not os.path.exists(newPath):
                 # Recreate the symlink if it won't overwrite an existing file
                 link = os.readlink(oldPath)
                 os.symlink(link, newPath)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090505/13df1415/attachment.html>