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

[source_changes at macosforge.org]

Revision: 6607
          http://trac.macosforge.org/projects/calendarserver/changeset/6607
Author:   glyph at apple.com
Date:     2010-11-10 18:55:54 -0800 (Wed, 10 Nov 2010)
Log Message:
-----------
put services in the right order, return 'top' multiservice

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:55:38 UTC (rev 6606)
+++ CalendarServer/branches/users/glyph/dont-start-postgres/calendarserver/tap/caldav.py	2010-11-11 02:55:54 UTC (rev 6607)
@@ -859,8 +859,8 @@
                     cp.connection, attachmentsRoot,
                     uid=postgresUID, gid=postgresGID
                 )
-                maybeUpgradeSvc.setServiceParent(cp)
-                return maybeUpgradeSvc
+                maybeUpgradeSvc.setServiceParent(ms)
+                return ms
             if os.getuid() == 0: # Only override if root
                 postgresUID = uid
                 postgresGID = gid
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101110/573b0833/attachment.html>