[CalendarServer-changes] [7997] CalendarServer/trunk/twistedcaldav/upgrade.py

[source_changes at macosforge.org]

Revision: 7997
          http://trac.macosforge.org/projects/calendarserver/changeset/7997
Author:   cdaboo at apple.com
Date:     2011-08-19 09:36:08 -0700 (Fri, 19 Aug 2011)
Log Message:
-----------
Skip any non-directories when doing a home-level upgrade.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/upgrade.py

Modified: CalendarServer/trunk/twistedcaldav/upgrade.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/upgrade.py	2011-08-19 16:34:57 UTC (rev 7996)
+++ CalendarServer/trunk/twistedcaldav/upgrade.py	2011-08-19 16:36:08 UTC (rev 7997)
@@ -37,7 +37,6 @@
 from twistedcaldav.mail import MailGatewayTokensDatabase
 from twistedcaldav.ical import Component
 from twistedcaldav import caldavxml
-from twistedcaldav.ical import Component
 from twistedcaldav.scheduling.cuaddress import LocalCalendarUser
 from twistedcaldav.scheduling.scheduler import DirectScheduler
 
@@ -457,6 +456,9 @@
                                 for home in os.listdir(secondPath):
                                     homePath = os.path.join(secondPath, home)
 
+                                    if not os.path.isdir(oldHome):
+                                        # Skip non-directories
+                                        continue
 
                                     if not upgradeCalendarHome(homePath,
                                         directory):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110819/4ca212f1/attachment.html>