[CalendarServer-changes] [11166] CalendarServer/branches/users/gaya/sharedgroups-3/txdav

source_changes at macosforge.org source_changes at macosforge.org
Fri May 10 15:09:44 PDT 2013


Revision: 11166
          http://trac.calendarserver.org//changeset/11166
Author:   gaya at apple.com
Date:     2013-05-10 15:09:44 -0700 (Fri, 10 May 2013)
Log Message:
-----------
checkpoint merge from 11145

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/sharedgroups-3/txdav/carddav/datastore/sql.py
    CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql.py

Modified: CalendarServer/branches/users/gaya/sharedgroups-3/txdav/carddav/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups-3/txdav/carddav/datastore/sql.py	2013-05-10 21:19:00 UTC (rev 11165)
+++ CalendarServer/branches/users/gaya/sharedgroups-3/txdav/carddav/datastore/sql.py	2013-05-10 22:09:44 UTC (rev 11166)
@@ -652,7 +652,6 @@
         # get ownerHomeIDs
         for dataRow in dataRows:
             bindMode, homeID, resourceID, bindName, bindStatus, bindMessage = dataRow[:6]  #@UnusedVariable
-            assert bindStatus != _BIND_MODE_OWN
             ownerHome = yield home.ownerHomeWithChildID(resourceID)
             ownerHomeToDataRowMap[ownerHome] = dataRow
 

Modified: CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql.py	2013-05-10 21:19:00 UTC (rev 11165)
+++ CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql.py	2013-05-10 22:09:44 UTC (rev 11166)
@@ -3143,12 +3143,10 @@
             propertyStores = yield PropertyStore.forMultipleResourcesWithResourceIDs(
                 home.uid(), home._txn, childResourceIDs
             )
-            print("loadAllObjects:%s dataRows=%s, childResourceID=%s, propertyStores=%s" % (cls, dataRows, childResourceIDs, propertyStores))
 
             # Get revisions
             revisions = (yield cls._revisionsForResourceIDs(childResourceIDs).on(home._txn, resourceIDs=childResourceIDs))
             revisions = dict(revisions)
-            print("loadAllObjects:%s dataRows=%s, childResourceID=%s, revisions=%s" % (cls, dataRows, childResourceIDs, revisions))
 
         # Create the actual objects merging in properties
         for items in dataRows:
@@ -3156,7 +3154,7 @@
             additionalBind = items[6:6 + len(cls.additionalBindColumns())]
             metadata = items[6 + len(cls.additionalBindColumns()):]
 
-            if bindStatus == _BIND_MODE_OWN:
+            if bindMode == _BIND_MODE_OWN:
                 ownerHome = home
                 ownerName = bindName
             else:
@@ -3179,7 +3177,8 @@
 
             # We have to re-adjust the property store object to account for possible shared
             # collections as previously we loaded them all as if they were owned
-            if bindStatus != _BIND_MODE_OWN:
+
+            if bindMode != _BIND_MODE_OWN:
                 propstore._setDefaultUserUID(ownerHome.uid())
             yield child._loadPropertyStore(propstore)
             results.append(child)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130510/ffea42d4/attachment.html>


More information about the calendarserver-changes mailing list