Commit 49d1daff authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Fix .ssh/forward.py exceptions for python2/3 compat

parent d3f9ab5e
Loading
Loading
Loading
Loading

.gnupg/gpg-agent.conf

0 → 100644
+8 −0
Original line number Diff line number Diff line
###+++--- GPGConf ---+++###
default-cache-ttl 600
max-cache-ttl 6000
enable-ssh-support
###+++--- GPGConf ---+++### Tue 20 Feb 2018 00:15:04 GMT
# GPGConf edited this configuration file.
# It will disable options before this marked block, but it will
# never change anything below these lines.
+4 −3
Original line number Diff line number Diff line
@@ -25,14 +25,15 @@ class Stream:
			sock.settimeout(2)
			try:
				sock.connect(addr)
			except (OSError, socket.timeout):
			except (IOError, socket.timeout) as e:
				sock.close()
				sock = None
				exc = e
			else:
				break

		if sock is None:
			raise OSError("Unable to connect to %s:%s" % (host, port))
			raise exc

		sock.settimeout(0)
		return cls(sock, sock)
@@ -119,6 +120,6 @@ def main():
if __name__ == '__main__':
	try:
		main()
	except OSError as exc:
	except IOError as exc:
		sys.stderr.write("Connection failed: %s\n" % str(exc))
		sys.exit(1)