[Commits] (pavlov) need to set etag before doing recursive puts so that we don't try to update ourselves again

commits at osafoundation.org commits at osafoundation.org
Thu Aug 19 14:17:52 PDT 2004


Commit by: pavlov
Modified files:
chandler/parcels/osaf/framework/webdav/Sync.py 1.6 1.7

Log message:
need to set etag before doing recursive puts so that we don't try to update ourselves again


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/webdav/Sync.py.diff?r1=text&tr1=1.6&r2=text&tr2=1.7

Index: chandler/parcels/osaf/framework/webdav/Sync.py
diff -u chandler/parcels/osaf/framework/webdav/Sync.py:1.6 chandler/parcels/osaf/framework/webdav/Sync.py:1.7
--- chandler/parcels/osaf/framework/webdav/Sync.py:1.6	Thu Aug 19 13:53:44 2004
+++ chandler/parcels/osaf/framework/webdav/Sync.py	Thu Aug 19 14:17:51 2004
@@ -67,6 +67,8 @@
 def merge(dav, item, davItem, hasLocalChanges):
     # for now, just pull changes from the server and overwrite local changes...
     print 'Doing merge'
+    item.etag = davItem.etag
+
     syncFromServer(item, davItem)
 
 



More information about the Commits mailing list