diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2023-03-15 19:20:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-15 19:20:26 +0200 |
| commit | 0c4bc751002555894fb1b7b8b75269dee0d665d2 (patch) | |
| tree | 9c5c0d16dd178484fd7cb9fc8c6ab13e55b56c1f | |
| parent | 16706bc59f5733dd28192b7220b2e5f1de720372 (diff) | |
| parent | 76bbd96c52f81467f8469026225528ba51f02805 (diff) | |
Merge pull request #13000 from FRRouting/mergify/bp/stable/8.4/pr-12996
tools: frr-reload fix list value not present (backport #12996)
| -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) |
