From 54d227232b504ff0e4ff9a6c43e09db3429be220 Mon Sep 17 00:00:00 2001 From: Vincent Lafeychine Date: Mon, 1 Apr 2024 00:13:22 +0200 Subject: [PATCH] chore(bird): Fix None flag --- roles/bird/filter_plugins/bird.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/bird/filter_plugins/bird.py b/roles/bird/filter_plugins/bird.py index 2cf01de..5bfae8f 100644 --- a/roles/bird/filter_plugins/bird.py +++ b/roles/bird/filter_plugins/bird.py @@ -99,7 +99,7 @@ class IPFlag(str): pattern = r"(?P.*?)(?P[+-]|\{[0-9]+,[0-9]+\})?$" parts = re.match(pattern, v) - return (ip_network(parts.group("ip")), parts.group("flag")) + return (ip_network(parts.group("ip")), parts.group("flag") or "") class NetMatch(BaseModel): @@ -245,7 +245,7 @@ def str_of_condition(condition: Condition, ctx: bool) -> str: m for m in matches if isinstance(m[0], IPv6Network) ] - return f"net ~ [ {', '.join([f'{network}{str(flag)}' for (network, flag) in networks])} ]" + return f"net ~ [ {', '.join([f'{network}{flag}' for (network, flag) in networks])} ]" def lines_of_action(action: Action, ctx: Context) -> Iterable[str]: