diff --git a/src/gam/__init__.py b/src/gam/__init__.py index cfe70cbd..d2ef9410 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -8951,17 +8951,17 @@ def doCheckConnection(): dns_err = None ip = 'unknown' try: - ip = socket.getaddrinfo(host, None)[0][-1][0] # works with ipv6 + ip = socket.getaddrinfo(host, None)[0][-1][0] # works with ipv6 except socket.gaierror as err: - dns_err = f'{not_okay}\n DNS failure: {err}\n' + dns_err = f'{not_okay}\n DNS failure: {err}\n' except Exception as e: - dns_err = f'{not_okay}\n Unknown DNS failure: {err}\n' + dns_err = f'{not_okay}\n Unknown DNS failure: {err}\n' check_line = f'Checking {host} ({ip}) ({try_count}/{host_count})...' writeStdout(f'{check_line:<100}') flushStdout() if dns_err: - writeStdout(dns_err) - continue + writeStdout(dns_err) + continue gen_firewall = 'You probably have security software or a firewall on your machine or network that is preventing GAM from making Internet connections. Check your network configuration or try running GAM on a hotspot or home network to see if the problem exists only on your organization\'s network.' try: if host.startswith('http'): @@ -8977,7 +8977,7 @@ def doCheckConnection(): writeStdout(f'{not_okay}\n Connection reset by peer. {gen_firewall}\n') except httplib2.error.ServerNotFoundError: writeStdout(f'{not_okay}\n Failed to find server. Your DNS is probably misconfigured.\n') - except ssl.SSLError as e: + except ssl.SSLError as e: if e.reason == 'SSLV3_ALERT_HANDSHAKE_FAILURE': writeStdout(f'{not_okay}\n GAM expects to connect with TLS 1.3 or newer and that failed. If your firewall / proxy server is not compatible with TLS 1.3 then you can tell GAM to allow TLS 1.2 by setting tls_min_version = TLSv1.2 in gam.cfg.\n') elif e.reason == 'CERTIFICATE_VERIFY_FAILED':