fix local syncing

This commit is contained in:
Damien Elmes 2011-01-07 13:35:15 +09:00
parent 2e2d93649e
commit 2ca27d389f

View file

@ -614,7 +614,8 @@ values
def bundleDeck(self): def bundleDeck(self):
# ensure modified is not greater than server time # ensure modified is not greater than server time
if getattr(self, "server", None): if getattr(self, "server", None) and getattr(
self.server, "timestamp", None):
self.deck.modified = min(self.deck.modified,self.server.timestamp) self.deck.modified = min(self.deck.modified,self.server.timestamp)
# and ensure lastSync is greater than modified # and ensure lastSync is greater than modified
self.deck.lastSync = max(time.time(), self.deck.modified+1) self.deck.lastSync = max(time.time(), self.deck.modified+1)