Browse Source

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

changes/85/727985/1
Zuul 2 months ago
committed by Gerrit Code Review
parent
commit
34775860aa
1 changed files with 5 additions and 1 deletions
  1. +5
    -1
      networking_ovn/ovsdb/commands.py

+ 5
- 1
networking_ovn/ovsdb/commands.py View File

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