0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

fix removing peer while pulling changes

Browse source
This commit is contained in:
j 2016-01-21 12:24:41 +05:30
parent 6f4672d296
commit 0ff3b9ee3c
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
oml/changelog.py
View file

@ -83,7 +83,6 @@ class Changelog(db.Model):
trigger_event('change', {}); trigger_event('change', {});
for change in changes: for change in changes:
if user.id in state.removepeer: if user.id in state.removepeer:
user.cleanup()
del state.removepeer[user.id] del state.removepeer[user.id]
return False return False
if not cls.apply_change(user, change, trigger=False): if not cls.apply_change(user, change, trigger=False):

2
oml/user/models.py
View file

@ -140,10 +140,10 @@ class User(db.Model):
if self.name in settings.ui['showFolder']: if self.name in settings.ui['showFolder']:
del settings.ui['showFolder'][self.name] del settings.ui['showFolder'][self.name]
settings.ui._save() settings.ui._save()
state.removepeer[self.id] = True
self.cleanup() self.cleanup()
if was_peering: if was_peering:
Changelog.record(state.user(), 'removepeer', self.id) Changelog.record(state.user(), 'removepeer', self.id)
state.removepeer[self.id] = True
self.save() self.save()
def cleanup(self): def cleanup(self):