Repository: libcloud
Updated Branches:
  refs/heads/trunk 6df77f6e2 -> 3d2a38db9


Modify deploy_node so it's future proof and will also work correctly when
authentication bug (https://github.com/paramiko/paramiko/pull/351) has been
fixed in paramiko.


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/b392c964
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/b392c964
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/b392c964

Branch: refs/heads/trunk
Commit: b392c964457e8c3948b615e0036f823ef420bc1a
Parents: 0314a1a
Author: Tomaz Muraus <[email protected]>
Authored: Sun Jul 6 21:48:01 2014 +0200
Committer: Tomaz Muraus <[email protected]>
Committed: Sun Jul 6 21:48:01 2014 +0200

----------------------------------------------------------------------
 libcloud/compute/base.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/b392c964/libcloud/compute/base.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/base.py b/libcloud/compute/base.py
index f9a9e31..a585128 100644
--- a/libcloud/compute/base.py
+++ b/libcloud/compute/base.py
@@ -42,8 +42,10 @@ from libcloud.utils.networking import is_valid_ip_address
 
 if have_paramiko:
     from paramiko.ssh_exception import SSHException
-    SSH_TIMEOUT_EXCEPTION_CLASSES = (SSHException, IOError, socket.gaierror,
-                                     socket.error)
+    from paramiko.ssh_exception import AuthenticationException
+
+    SSH_TIMEOUT_EXCEPTION_CLASSES = (AuthenticationException, SSHException,
+                                     IOError, socket.gaierror, socket.error)
 else:
     SSH_TIMEOUT_EXCEPTION_CLASSES = (IOError, socket.gaierror, socket.error)
 

Reply via email to