Rev 4558: Reformat the errors so they aren't so long. in http://bazaar.launchpad.net/~jameinel/bzr/1.18-ssh-auth-375867

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/1.18-ssh-auth-375867

------------------------------------------------------------
revno: 4558
revision-id: john at arbash-meinel.com-20090720212829-ludtl4fohltqilp0
parent: john at arbash-meinel.com-20090720212442-zmy7qp7g5am2kqvh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.18-ssh-auth-375867
timestamp: Mon 2009-07-20 16:28:29 -0500
message:
  Reformat the errors so they aren't so long.
-------------- next part --------------
=== modified file 'bzrlib/transport/ssh.py'
--- a/bzrlib/transport/ssh.py	2009-07-20 21:24:42 +0000
+++ b/bzrlib/transport/ssh.py	2009-07-20 21:28:29 +0000
@@ -503,7 +503,7 @@
         pass
     if 'password' not in supported_auth_types:
         raise errors.ConnectionError('Unable to authenticate to SSH host as'
-            ' %s@%s (supported auth types: %s)'
+            '\n  %s@%s\nsupported auth types: %s'
             % (username, host, supported_auth_types))
 
     if password:
@@ -520,11 +520,12 @@
         try:
             paramiko_transport.auth_password(username, password)
         except paramiko.SSHException, e:
-            raise errors.ConnectionError('Failed to authenticate to SSH host'
-                                         ' as %s@%s' % (username, host), e)
+            raise errors.ConnectionError(
+                'Unable to authenticate to SSH host as'
+                '\n  %s@%s\n' % (username, host), e)
     else:
-        raise errors.ConnectionError('Failed to authenticate to SSH host'
-                                     ' as %s@%s' % (username, host))
+        raise errors.ConnectionError('Unable to authenticate to SSH host as'
+                                     '  %s@%s' % (username, host))
 
 
 def _try_pkey_auth(paramiko_transport, pkey_class, username, filename):