diff options
| author | John Estabrook <jestabro@vyos.io> | 2026-05-26 10:27:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-26 10:27:03 -0500 |
| commit | f420c2913a30cac5d61f94061466f6f6ccf7d81c (patch) | |
| tree | ca124e8d5c479a700dd2f6dbda5f0cedb243e20f /python | |
| parent | f333e72b999c296565fc23e79b3bf651dc85afb0 (diff) | |
| parent | c65a11c2dc645c3aa77d7e80ba78091e9fbffdfc (diff) | |
| download | vyos-1x-f420c2913a30cac5d61f94061466f6f6ccf7d81c.tar.gz vyos-1x-f420c2913a30cac5d61f94061466f6f6ccf7d81c.zip | |
Merge pull request #5157 from xTITUSMAXIMUSX/current
geoip: T8590: fix initialization failure and set clobbering on boot and commit
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/geoip.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/python/vyos/geoip.py b/python/vyos/geoip.py index 619af0785..db2313ab9 100644 --- a/python/vyos/geoip.py +++ b/python/vyos/geoip.py @@ -217,6 +217,9 @@ def geoip_update(firewall=None, policy=None): if firewall: for codes, path in dict_search_recursive(firewall, 'country_code'): + if path[0] == 'policy': + continue + version = 6 if path[0] == 'ipv6' else 4 vprefix = '6' if version == 6 else '' set_name = f'GEOIP_CC{vprefix}_{path[1]}_{path[2]}_{path[4]}' @@ -224,6 +227,9 @@ def geoip_update(firewall=None, policy=None): if policy: for codes, path in dict_search_recursive(policy, 'country_code'): + if path[0] == 'firewall': + continue + version = 6 if path[0] == 'route6' else 4 vprefix = '6' if version == 6 else '' set_name = f'GEOIP_CC{vprefix}_{path[0]}_{path[1]}_{path[3]}' |