From 0420bfb494c48241c0ce7ef2b33e53bc9ca7b6b4 Mon Sep 17 00:00:00 2001 From: Adarnof Date: Thu, 5 Nov 2015 02:25:12 +0000 Subject: [PATCH] improved handling of corp/alliance model deletion --- celerytask/tasks.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/celerytask/tasks.py b/celerytask/tasks.py index af1a01df..2ffc9a1a 100755 --- a/celerytask/tasks.py +++ b/celerytask/tasks.py @@ -432,14 +432,16 @@ def run_corp_update(): if all_corp_info.corporation_id != settings.CORP_ID: if not all_corp_info.is_blue: all_corp_info.delete() - elif all_corp_info.alliance is not None: - if all_corp_info.alliance.alliance_id != settings.ALLIANCE_ID: - if not all_corp_info.is_blue: - all_corp_info.delete() - + else: + if all_corp_info.alliance is not None: + if all_corp_info.alliance.alliance_id != settings.ALLIANCE_ID: + if not all_corp_info.is_blue: + all_corp_info.delete() + elif not all_corp_info.is_blue: + all_corp_info.delete() # Check the alliances for all_alliance_info in EveManager.get_all_alliance_info(): - if (not settings.IS_CORP and all_alliance_info.alliance_id != settings.ALLIANCE_ID): + if not settings.IS_CORP and all_alliance_info.alliance_id != settings.ALLIANCE_ID: if all_alliance_info.is_blue is not True: all_alliance_info.delete()