Fix paramiko password prompting

2011-01-04 22:37:27 +01:00 · 2011-01-04 22:37:27 +01:00 · 811bbb3e89
parent 0e3ba200b1
commit 811bbb3e89
1 changed files with 7 additions and 2 deletions
--- a/darc/remote.py
+++ b/darc/remote.py
@ -74,8 +74,13 @@ class RemoteStore(object):
            try:
                self.client.connect(**params)
                break
-            except paramiko.PasswordRequiredException:
-                params['password'] = getpass.getpass('Password for %(username)s@%(hostname)s:' % params)
+            except (paramiko.PasswordRequiredException,
+		    paramiko.AuthenticationException,
+		    paramiko.SSHException):
+		if not 'password' in params:
+			params['password'] = getpass.getpass('Password for %(username)s@%(hostname)s:' % params)
+		else:
+		    raise

        self.unpacker = msgpack.Unpacker()
        self.transport = self.client.get_transport()