]> git.puffer.fish Git - mirror/frr.git/commitdiff
tools: Do not append an empty list (pim_vrfs) to the config lines
authorDonatas Abraitis <donatas@opensourcerouting.org>
Sat, 20 Jul 2024 00:29:21 +0000 (03:29 +0300)
committerDonatas Abraitis <donatas@opensourcerouting.org>
Sat, 20 Jul 2024 00:29:21 +0000 (03:29 +0300)
If pim_vrfs is empty, we append [] into the lines array, and the reload is broken
since it expects only strings, but gets an array inside at the end.

```
Traceback (most recent call last):
  File "/usr/lib/frr/frr-reload.py", line 2227, in <module>
    log.debug("New Frr Config\n%s", newconf.get_lines())
  File "/usr/lib/frr/frr-reload.py", line 436, in get_lines
    return "\n".join(self.lines)
TypeError: sequence item 45: expected str instance, list found
```

Fixes: 98d47f43fbba4e376c8351c724e8c625799805f7 ("tools: Fix frr-reload to support legacy pim configuration from file")
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
tools/frr-reload.py

index 47e3637550e1c0e821e4dc7a2289125814822a32..8a39f4204dae086bd8702daf36c221464df97d53 100755 (executable)
@@ -400,7 +400,8 @@ class Config(object):
 
             self.lines.append(line)
 
-        self.lines.append(pim_vrfs)
+        if len(pim_vrfs) > 0:
+            self.lines.append(pim_vrfs)
 
         self.load_contexts()