Browse Source

Merge "Work around potential double row.delete() call" into stable/queens

changes/12/725512/1
Zuul 1 year ago
committed by Gerrit Code Review
parent
commit
ecbc1e4647
  1. 6
      networking_ovn/ovsdb/commands.py

6
networking_ovn/ovsdb/commands.py

@ -617,7 +617,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

Loading…
Cancel
Save