Merge "Work around potential double row.delete() call"

This commit is contained in:
Zuul 2019-12-24 00:19:51 +00:00 committed by Gerrit Code Review
commit 3b074128ca
1 changed files with 5 additions and 1 deletions

View File

@ -630,7 +630,11 @@ class UpdateACLsCommand(command.BaseCommand):
# Delete old ACLs.
if acl_del_objs:
for acl_del_obj in acl_del_objs:
acl_del_obj.delete()
try:
acl_del_obj.delete()
except AssertionError:
# If we try to delete a row twice, just continue
pass
# Add new ACLs.
acl_add_objs = None