must commit on concurrent update

This commit is contained in:
Damien Elmes 2014-07-04 18:06:40 +09:00
parent 653f001da0
commit a93c3423e3

View File

@ -799,9 +799,11 @@ class MediaSyncer(object):
if serverLastUsn - processedCnt == lastUsn:
self.col.log("lastUsn in sync, updating local")
self.col.media.setLastUsn(serverLastUsn)
self.col.media.setLastUsn(serverLastUsn) # commits
else:
self.col.log("concurrent update, skipping usn update")
# commit for markClean
self.col.media.db.commit()
updateConflict = True
if updateConflict: