From d2a905e0c54ed8f336deafc30341ee057a83afda Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Mon, 3 Jan 2011 15:44:18 +0000 Subject: [PATCH] Move group check after corporate, allows for corporate level groups without extra commands being executed --- sso/services/ts3/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sso/services/ts3/__init__.py b/sso/services/ts3/__init__.py index 6d3436a..ff4b06e 100644 --- a/sso/services/ts3/__init__.py +++ b/sso/services/ts3/__init__.py @@ -160,11 +160,6 @@ class TS3Service(BaseService): self.conn.send_command('servergroupaddclient', {'sgid': tsgrplist[g.name], 'cldbid': cldbid }) usrgrplist[g.name] = tsgrplist[g.name] - # Remove OKed groups from the delete list - for g in groups: - if g.name in usrgrplist: - del usrgrplist[g.name] - # Add to corporation groups if character and character.corporation: if character.corporation.name in usrgrplist: @@ -174,6 +169,11 @@ class TS3Service(BaseService): tsgrplist[g.name] = self._create_group(character.corporation.name) self.conn.send_command('servergroupaddclient', {'sgid': tsgrplist[character.corporation.name], 'cldbid': cldbid }) + # Remove OKed groups from the delete list + for g in groups: + if g.name in usrgrplist: + del usrgrplist[g.name] + # Remove ignored and admin groups for k, v in usrgrplist.items(): if not int(v) == self.settings['authed_sgid'] and not int(v) in self.settings['ignore_groups']: