diff options
| author | Chirag Shah <chirag@nvidia.com> | 2023-03-14 21:32:40 -0700 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2023-03-15 12:00:33 +0000 |
| commit | 76bbd96c52f81467f8469026225528ba51f02805 (patch) | |
| tree | 9c5c0d16dd178484fd7cb9fc8c6ab13e55b56c1f | |
| parent | 16706bc59f5733dd28192b7220b2e5f1de720372 (diff) | |
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)
| -rwxr-xr-x | tools/frr-reload.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/frr-reload.py b/tools/frr-reload.py index bf402e1bef..b6dac265e3 100755 --- a/tools/frr-reload.py +++ b/tools/frr-reload.py @@ -1490,10 +1490,12 @@ def ignore_delete_re_add_lines(lines_to_add, lines_to_del): lines_to_add_to_del.append((tmp_ctx_keys, line)) for (ctx_keys, line) in lines_to_del_to_del: - lines_to_del.remove((ctx_keys, line)) + if line is not None: + lines_to_del.remove((ctx_keys, line)) for (ctx_keys, line) in lines_to_add_to_del: - lines_to_add.remove((ctx_keys, line)) + if line is not None: + lines_to_add.remove((ctx_keys, line)) return (lines_to_add, lines_to_del) |