From 246b3e17e067f59bc5f3afa678eda17a9390eb4b Mon Sep 17 00:00:00 2001 From: Lucas Christian Date: Sun, 10 Mar 2024 14:12:44 -0700 Subject: T6114: fix broken migration dhcpv6-server 4-to-5 --- src/migration-scripts/dhcpv6-server/4-to-5 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/migration-scripts/dhcpv6-server/4-to-5 b/src/migration-scripts/dhcpv6-server/4-to-5 index ae506b9c5..55fda91b3 100755 --- a/src/migration-scripts/dhcpv6-server/4-to-5 +++ b/src/migration-scripts/dhcpv6-server/4-to-5 @@ -42,8 +42,11 @@ def find_subnet_interface(subnet): def check_addr(if_path): if config.exists(if_path + ['address']): for addr in config.return_values(if_path + ['address']): - if ip_network(addr, strict=False) == subnet_net: - return True + try: + if ip_network(addr, strict=False) == subnet_net: + return True + except: + pass # interface address was probably "dhcp" or other magic string return None for iftype in config.list_nodes(['interfaces']): -- cgit v1.2.3