From 353a9c32faaf3a2884f2c6b1e7a30fb270995a84 Mon Sep 17 00:00:00 2001 From: Jenkins Date: Wed, 28 Jun 2023 13:50:12 -0700 Subject: [PATCH] Fix wart in network util method --- salt/utils/network.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/salt/utils/network.py b/salt/utils/network.py index c1cf746b672..cb0fdbbea0c 100644 --- a/salt/utils/network.py +++ b/salt/utils/network.py @@ -2241,7 +2241,7 @@ def _test_addrs(addrinfo, port): if ip_addr in ip_addrs: continue ip_addrs.append(ip_addr) - + s = None try: s = socket.socket(ip_family, socket.SOCK_STREAM) s.settimeout(2) @@ -2251,7 +2251,8 @@ def _test_addrs(addrinfo, port): except OSError: pass finally: - s.close() + if s is not None: + s.close() return ip_addrs