[CalendarServer-changes] [5155] CalendarServer/branches/users/wsanchez/m1

source_changes at macosforge.org source_changes at macosforge.org
Fri Feb 19 08:40:59 PST 2010


Revision: 5155
          http://trac.macosforge.org/projects/calendarserver/changeset/5155
Author:   wsanchez at apple.com
Date:     2010-02-19 08:40:58 -0800 (Fri, 19 Feb 2010)
Log Message:
-----------
Pulled up r5152 from trunk.

Revision Links:
--------------
    http://trac.macosforge.org/projects/calendarserver/changeset/5152

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/m1/calendarserver/util.py

Property Changed:
----------------
    CalendarServer/branches/users/wsanchez/m1/


Property changes on: CalendarServer/branches/users/wsanchez/m1
___________________________________________________________________
Modified: svn:mergeinfo
   - /CalendarServer/branches/config-separation:4379-4443
/CalendarServer/branches/egg-info-351:4589-4625
/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
/CalendarServer/branches/users/sagen/locations-resources:5032-5051
/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
/CalendarServer/branches/users/sagen/resources-2:5084-5093
/CalendarServer/trunk:5151
   + /CalendarServer/branches/config-separation:4379-4443
/CalendarServer/branches/egg-info-351:4589-4625
/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
/CalendarServer/branches/users/sagen/locations-resources:5032-5051
/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
/CalendarServer/branches/users/sagen/resources-2:5084-5093
/CalendarServer/trunk:5151-5152

Modified: CalendarServer/branches/users/wsanchez/m1/calendarserver/util.py
===================================================================
--- CalendarServer/branches/users/wsanchez/m1/calendarserver/util.py	2010-02-19 16:38:26 UTC (rev 5154)
+++ CalendarServer/branches/users/wsanchez/m1/calendarserver/util.py	2010-02-19 16:40:58 UTC (rev 5155)
@@ -395,8 +395,13 @@
     overrides = { }
     if resources:
         for path, cls, args, scheme in resources:
+
+            # putChild doesn't want "/" starting the path
             root.putChild(path, cls(root, *args))
 
+            # overrides requires "/" prepended
+            path = "/" + path
+
             if scheme == "basic":
                 overrides[path] = (BasicCredentialFactory(realm),)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100219/ba72d0eb/attachment-0001.html>


More information about the calendarserver-changes mailing list