[CalendarServer-changes] [5966] CalendarServer/trunk

source_changes at macosforge.org source_changes at macosforge.org
Mon Aug 2 11:12:05 PDT 2010


Revision: 5966
          http://trac.macosforge.org/projects/calendarserver/changeset/5966
Author:   sagen at apple.com
Date:     2010-08-02 11:12:04 -0700 (Mon, 02 Aug 2010)
Log Message:
-----------
CommonHomeChild's push notification id should include the parent home's id as well, for uniqueness.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/static.py
    CalendarServer/trunk/txcaldav/calendarstore/test/common.py
    CalendarServer/trunk/txcarddav/addressbookstore/test/common.py
    CalendarServer/trunk/txdav/common/datastore/file.py

Modified: CalendarServer/trunk/twistedcaldav/static.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/static.py	2010-08-02 17:55:36 UTC (rev 5965)
+++ CalendarServer/trunk/twistedcaldav/static.py	2010-08-02 18:12:04 UTC (rev 5966)
@@ -656,9 +656,6 @@
         except:
             return fail(Failure())
 
-        if hasattr(self, 'clientNotifier'):
-            self.clientNotifier.notify(op="update")
-
         return succeed(True)
 
     ##

Modified: CalendarServer/trunk/txcaldav/calendarstore/test/common.py
===================================================================
--- CalendarServer/trunk/txcaldav/calendarstore/test/common.py	2010-08-02 17:55:36 UTC (rev 5965)
+++ CalendarServer/trunk/txcaldav/calendarstore/test/common.py	2010-08-02 18:12:04 UTC (rev 5966)
@@ -531,11 +531,11 @@
             self.notifierFactory.compare(
                 [
                     ("update", "home1"),
-                    ("update", "calendar_1"),
+                    ("update", "home1/calendar_1"),
                     ("update", "home1"),
-                    ("update", "calendar_1"),
+                    ("update", "home1/calendar_1"),
                     ("update", "home1"),
-                    ("update", "calendar_1"),
+                    ("update", "home1/calendar_1"),
                 ]
             )
         )
@@ -693,7 +693,7 @@
             self.notifierFactory.compare(
                 [
                     ("update", "home1"),
-                    ("update", "calendar_1"),
+                    ("update", "home1/calendar_1"),
                 ]
             )
         )
@@ -799,7 +799,7 @@
             self.notifierFactory.compare(
                 [
                     ("update", "home1"),
-                    ("update", "calendar_1"),
+                    ("update", "home1/calendar_1"),
                 ]
             )
         )

Modified: CalendarServer/trunk/txcarddav/addressbookstore/test/common.py
===================================================================
--- CalendarServer/trunk/txcarddav/addressbookstore/test/common.py	2010-08-02 17:55:36 UTC (rev 5965)
+++ CalendarServer/trunk/txcarddav/addressbookstore/test/common.py	2010-08-02 18:12:04 UTC (rev 5966)
@@ -498,11 +498,11 @@
             self.notifierFactory.compare(
                 [
                     ("update", "home1"),
-                    ("update", "addressbook_1"),
+                    ("update", "home1/addressbook_1"),
                     ("update", "home1"),
-                    ("update", "addressbook_1"),
+                    ("update", "home1/addressbook_1"),
                     ("update", "home1"),
-                    ("update", "addressbook_1"),
+                    ("update", "home1/addressbook_1"),
                 ]
             )
         )
@@ -633,7 +633,7 @@
             self.notifierFactory.compare(
                 [
                     ("update", "home1"),
-                    ("update", "addressbook_1"),
+                    ("update", "home1/addressbook_1"),
                 ]
             )
         )
@@ -739,7 +739,7 @@
             self.notifierFactory.compare(
                 [
                     ("update", "home1"),
-                    ("update", "addressbook_1"),
+                    ("update", "home1/addressbook_1"),
                 ]
             )
         )

Modified: CalendarServer/trunk/txdav/common/datastore/file.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/file.py	2010-08-02 17:55:36 UTC (rev 5965)
+++ CalendarServer/trunk/txdav/common/datastore/file.py	2010-08-02 18:12:04 UTC (rev 5966)
@@ -324,7 +324,8 @@
         childPath = self._path.child(name)
         if childPath.isdir():
             if self._notifier:
-                notifier = self._notifier.clone(label="collection", id=name)
+                childID = "%s/%s" % (self.uid(), name)
+                notifier = self._notifier.clone(label="collection", id=childID)
             else:
                 notifier = None
             existingChild = self._childClass(name, self, notifier)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100802/cc177abc/attachment-0001.html>


More information about the calendarserver-changes mailing list