[CalendarServer-changes] [769] CalendarServer/trunk/bin/calendar_restore

[source_changes at macosforge.org]

Revision: 769
          http://trac.macosforge.org/projects/calendarserver/changeset/769
Author:   dreid at apple.com
Date:     2006-12-08 12:06:38 -0800 (Fri, 08 Dec 2006)

Log Message:
-----------
make sure we fall back correctly

Modified Paths:
--------------
    CalendarServer/trunk/bin/calendar_restore

Modified: CalendarServer/trunk/bin/calendar_restore
===================================================================
--- CalendarServer/trunk/bin/calendar_restore	2006-12-08 19:42:49 UTC (rev 768)
+++ CalendarServer/trunk/bin/calendar_restore	2006-12-08 20:06:38 UTC (rev 769)
@@ -44,11 +44,11 @@
     if os.path.exists(configFile):
         root = plistlib.readPlist(configFile)['DocumentRoot']
         
-        if not root and os.path.exists(configFile + '.default'):
-            root = plistlib.readPlist(configFile + '.default')['DocumentRoot']
+    if not root and os.path.exists(configFile + '.default'):
+        root = plistlib.readPlist(configFile + '.default')['DocumentRoot']
 
-            if not root: 
-                root = documentRoot
+        if not root: 
+            root = documentRoot
 
     if not root:
         print "Could not find document root"

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061208/39db0d29/attachment.html