]> git.puffer.fish Git - mirror/frr.git/commit
tools: frr-reload fix list value not present 13000/head
authorChirag Shah <chirag@nvidia.com>
Wed, 15 Mar 2023 04:32:40 +0000 (21:32 -0700)
committerMergify <37929162+mergify[bot]@users.noreply.github.com>
Wed, 15 Mar 2023 12:00:33 +0000 (12:00 +0000)
commit76bbd96c52f81467f8469026225528ba51f02805
tree9c5c0d16dd178484fd7cb9fc8c6ab13e55b56c1f
parent16706bc59f5733dd28192b7220b2e5f1de720372
tools: frr-reload fix list value not present

Check for value present in list before removing
as in certain python3 ValueError traceback is observed.

Traceback (most recent call last):
  File "/usr/lib/frr/frr-reload.py",
line 2278, in <module>
    (lines_to_add, lines_to_del, restart_frr)
= compare_context_objects(newconf, running)
  File "/usr/lib/frr/frr-reload.py",
line 1933, in compare_context_objects
    lines_to_add, lines_to_del
  File "/usr/lib/frr/frr-reload.py",
line 1549, in ignore_delete_re_add_lines
    lines_to_del.remove((ctx_keys, line))
ValueError: list.remove(x): x not in list

Ticket:#3389979
Issue:3389979

Testing Done:
With fix perform frr-relaod on frr.conf config where earlier
traceback was seen.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Signed-off-by: Chirag Shah <chirag@nvidia.com>
(cherry picked from commit 1543f58b5541c0ddb5e53bb7994136dcb5f836cb)
tools/frr-reload.py