[CalendarServer-changes] [6609] CalendarServer/branches/users/glyph/dont-start-postgres/ calendarserver/tap/caldav.py

[source_changes at macosforge.org]

Revision: 6609
          http://trac.macosforge.org/projects/calendarserver/changeset/6609
Author:   glyph at apple.com
Date:     2010-11-10 18:56:27 -0800 (Wed, 10 Nov 2010)
Log Message:
-----------
Get rid of the other occurrence of the static string "attachments"

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/dont-start-postgres/calendarserver/tap/caldav.py

Modified: CalendarServer/branches/users/glyph/dont-start-postgres/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/branches/users/glyph/dont-start-postgres/calendarserver/tap/caldav.py	2010-11-11 02:56:11 UTC (rev 6608)
+++ CalendarServer/branches/users/glyph/dont-start-postgres/calendarserver/tap/caldav.py	2010-11-11 02:56:27 UTC (rev 6609)
@@ -846,17 +846,15 @@
         @rtype: L{IService}
         """
         if config.UseDatabase:
-            dbRoot = CachingFilePath(config.DatabaseRoot)
             def subServiceFactory(connectionFactory):
                 # The database server is running at this point, so do the
                 # filesystem->database upgrade.
                 ms = ErrorLoggingMultiService()
                 cp = ConnectionPool(connectionFactory)
                 cp.setServiceParent(ms)
-                attachmentsRoot = dbRoot.child("attachments")
                 maybeUpgradeSvc = UpgradeToDatabaseService.wrapService(
                     CachingFilePath(config.DocumentRoot), mainService,
-                    cp.connection, attachmentsRoot,
+                    cp.connection, CachingFilePath(config.AttachmentsRoot),
                     uid=postgresUID, gid=postgresGID
                 )
                 maybeUpgradeSvc.setServiceParent(ms)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101110/0ed6ea24/attachment-0001.html>