[project @ robey@lag.net-20061226012748-lmbxlsue9q2jzk8x]

if connecting to the agent fails, assume it's just not there, and don't
raise an exception.  (suggestion from martin pool on bazaar-dev.)

1 files changed, 5 insertions, 1 deletions

diff --git a/paramiko/agent.py b/paramiko/agent.py
index b40a66d0..a01d3c1f 100644
--- a/paramiko/agent.py
+++ b/paramiko/agent.py
@@ -58,7 +58,11 @@ class Agent:
         self.keys = ()
         if ('SSH_AUTH_SOCK' in os.environ) and (sys.platform != 'win32'):
             conn = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-            conn.connect(os.environ['SSH_AUTH_SOCK'])
+            try:
+                conn.connect(os.environ['SSH_AUTH_SOCK'])
+            except:
+                # probably a dangling env var: the ssh agent is gone
+                return
             self.conn = conn
         elif sys.platform == 'win32':
             import win_pageant