[CalendarServer-changes] [1928] CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav /directory/principal.py

source_changes at macosforge.org source_changes at macosforge.org
Fri Sep 28 17:12:05 PDT 2007


Revision: 1928
          http://trac.macosforge.org/projects/calendarserver/changeset/1928
Author:   wsanchez at apple.com
Date:     2007-09-28 17:12:05 -0700 (Fri, 28 Sep 2007)

Log Message:
-----------
Pulled up r1927 from trunk.

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/directory/principal.py

Modified: CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/directory/principal.py	2007-09-28 21:48:41 UTC (rev 1927)
+++ CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/directory/principal.py	2007-09-29 00:12:05 UTC (rev 1928)
@@ -469,11 +469,13 @@
             for relative in getattr(record, method)():
                 if relative not in records:
                     found = self.parent.principalForRecord(relative)
+                    if found is None:
+                        log.err("No principal found for directory record: %r" % (relative,))
+                    else:
+                        if proxy:
+                            found = found.getChild("calendar-proxy-write")
+                        relatives.add(found)
 
-                    if proxy:
-                        found = found.getChild("calendar-proxy-write")
-                    relatives.add(found)
-
                     self._getRelatives(method, relative, relatives, records)
 
         return relatives

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


More information about the calendarserver-changes mailing list