[CalendarServer-changes] [12184]

[source_changes at macosforge.org]

Revision: 12184
          http://trac.calendarserver.org//changeset/12184
Author:   gaya at apple.com
Date:     2013-12-20 21:51:00 -0800 (Fri, 20 Dec 2013)
Log Message:
-----------
sync report with revision == 0 on shared address book now returns addressbook.vcf

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml
    CalendarServer/trunk/txdav/carddav/datastore/sql.py

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml	2013-12-21 05:25:27 UTC (rev 12183)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml	2013-12-21 05:51:00 UTC (rev 12184)
@@ -308,6 +308,7 @@
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
 						<value>$sharedaddressbook:/</value>
+						<value>$sharedaddressbook:/addressbook.vcf</value>
 					</arg>
 				</verify>
 				<grabelement>
@@ -3950,6 +3951,7 @@
 						<value>$userid2:/</value>
 						<value>$userid2:/1.vcf</value>
 						<value>$userid2:/2.vcf</value>
+						<value>$userid2:/addressbook.vcf</value>
 					</arg>
 				</verify>
 			</request>
@@ -3980,6 +3982,7 @@
 						<value>$userid2:/</value>
 						<value>$userid2:/1.vcf</value>
 						<value>$userid2:/2.vcf</value>
+						<value>$userid2:/addressbook.vcf</value>
 					</arg>
 				</verify>
 			</request>
@@ -4010,6 +4013,7 @@
 						<value>$userid2:/</value>
 						<value>$userid2:/1.vcf</value>
 						<value>$userid2:/2.vcf</value>
+						<value>$userid2:/addressbook.vcf</value>
 					</arg>
 				</verify>
 			</request>
@@ -4267,6 +4271,7 @@
 						<value>$userid2:/</value>
 						<value>$userid2:/1.vcf</value>
 						<value>$userid2:/2.vcf</value>
+						<value>$userid2:/addressbook.vcf</value>
 					</arg>
 				</verify>
 			</request>
@@ -4362,6 +4367,7 @@
 						<value>$userid2:/</value>
 						<value>$userid2:/1.vcf</value>
 						<value>$userid2:/2.vcf</value>
+						<value>$userid2:/addressbook.vcf</value>
 					</arg>
 				</verify>
 			</request>
@@ -4451,6 +4457,7 @@
 						<value>$userid2:/</value>
 						<value>$userid2:/1.vcf</value>
 						<value>$userid2:/2.vcf</value>
+						<value>$userid2:/addressbook.vcf</value>
 					</arg>
 				</verify>
 			</request>
@@ -4544,6 +4551,7 @@
 						<value>$userid2:/</value>
 						<value>$userid2:/1.vcf</value>
 						<value>$userid2:/2.vcf</value>
+						<value>$userid2:/addressbook.vcf</value>
 					</arg>
 				</verify>
 			</request>
@@ -5268,9 +5276,11 @@
 						<value>$userid3:/</value>
 						<value>$userid3:/1.vcf</value>
 						<value>$userid3:/2.vcf</value>
+						<value>$userid3:/addressbook.vcf</value>
 						<value>$userid4:/</value>
 						<value>$userid4:/1.vcf</value>
 						<value>$userid4:/2.vcf</value>
+						<value>$userid4:/addressbook.vcf</value>
 					</arg>
 				</verify>
 				<grabelement>
@@ -5467,9 +5477,11 @@
 						<value>$userid3:/</value>
 						<value>$userid3:/1.vcf</value>
 						<value>$userid3:/2.vcf</value>
+						<value>$userid3:/addressbook.vcf</value>
 						<value>$userid4:/</value>
 						<value>$userid4:/1.vcf</value>
 						<value>$userid4:/2.vcf</value>
+						<value>$userid4:/addressbook.vcf</value>
 					</arg>
 				</verify>
 				<verify>
@@ -6605,9 +6617,11 @@
 						<name>okhrefs</name>
 						<value>$addressbook:/</value>
 						<value>$userid3:/</value>
+						<value>$userid3:/addressbook.vcf</value>
 						<value>$userid4:/</value>
 						<value>$userid4:/1.vcf</value>
 						<value>$userid4:/2.vcf</value>
+						<value>$userid4:/addressbook.vcf</value>
 					</arg>
 				</verify>
 				<grabelement>

Modified: CalendarServer/trunk/txdav/carddav/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/carddav/datastore/sql.py	2013-12-21 05:25:27 UTC (rev 12183)
+++ CalendarServer/trunk/txdav/carddav/datastore/sql.py	2013-12-21 05:51:00 UTC (rev 12184)
@@ -625,12 +625,8 @@
             # add change for addressbook group
             changed, deleted = yield super(AddressBook, self).sharedChildResourceNamesSinceRevision(revision, depth)
 
-            #===================================================================
-            # # Add the following to add the addressbook group in sync report:
-            #
-            # if changed or deleted and depth != "1":
-            #     changed.add("%s/%s" % (path, self._groupForSharedAddressBookName(),))
-            #===================================================================
+            if revision == 0 and depth != "1":
+                changed.add("%s/%s" % (path, self._groupForSharedAddressBookName(),))
 
             returnValue((changed, deleted))
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/52e43b93/attachment.html>