From e9235d8b54c145666f538ff13bccb99b009bccef Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Thu, 29 Jun 2017 00:15:56 -0400 Subject: [PATCH] update delete_inventory task --- awx/main/tasks.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 27ad41faa7..331bbc76ef 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -360,18 +360,17 @@ def update_host_smart_inventory_memberships(): def delete_inventory(inventory_id): with ignore_inventory_computed_fields(), \ ignore_inventory_group_removal(): - with transaction.atomic(): - try: - i = Inventory.objects.get(id=inventory_id) - except Inventory.DoesNotExist: - logger.error("Delete Inventory failed due to missing inventory: " + str(inventory_id)) - return + try: + i = Inventory.objects.get(id=inventory_id) i.delete() - emit_channel_notification( - 'inventories-status_changed', - {'group_name': 'inventories', 'inventory_id': inventory_id, 'status': 'deleted'} - ) - logger.debug('Deleted inventory: %s' % inventory_id) + emit_channel_notification( + 'inventories-status_changed', + {'group_name': 'inventories', 'inventory_id': inventory_id, 'status': 'deleted'} + ) + logger.debug('Deleted inventory: %s' % inventory_id) + except Inventory.DoesNotExist: + logger.error("Delete Inventory failed due to missing inventory: " + str(inventory_id)) + return class BaseTask(Task):