Commit 386fe12f authored by Ondřej Kuzník's avatar Ondřej Kuzník
Browse files

Fix cookie updates

parent 0f891992
......@@ -70,6 +70,11 @@ class SyncreplCookie:
def update(self, cookie):
"Merge the two cookies, incorporating all CSNs into this one"
updated = False
if cookie is None:
updated = bool(self)
self._csnset = {}
return updated
if isinstance(cookie, __class__):
for sid, csn in cookie._csnset.items():
if sid not in self._csnset or self._csnset[sid] < csn:
......
......@@ -263,5 +263,5 @@ class SyncreplEnvironment:
else: # a cookie reset happened, recreate environment cookie
self.cookie = SyncreplCookie()
for uri, provider in self.providers.items():
cookie.update(provider.cookie)
self.cookie.update(provider.cookie)
self.cookie_updated(self.cookie)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment