dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

One more patch from @clarete's work

This commit is contained in:
Jeff Forcier 2012-11-05 17:47:33 -08:00
parent 191a5fc08c
commit fd392d6b20
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
paramiko/transport.py
View File

@ -44,7 +44,8 @@ from paramiko.primes import ModulusPack
from paramiko.rsakey import RSAKey from paramiko.rsakey import RSAKey
from paramiko.server import ServerInterface from paramiko.server import ServerInterface
from paramiko.sftp_client import SFTPClient from paramiko.sftp_client import SFTPClient
from paramiko.ssh_exception import SSHException, BadAuthenticationType, ChannelException from paramiko.ssh_exception import (SSHException, BadAuthenticationType,
ChannelException, ProxyCommandFailure)
from paramiko.util import retry_on_signal from paramiko.util import retry_on_signal
from Crypto import Random from Crypto import Random
@ -1674,6 +1675,8 @@ class Transport (threading.Thread):
timeout = 2 timeout = 2
try: try:
buf = self.packetizer.readline(timeout) buf = self.packetizer.readline(timeout)
except ProxyCommandFailure:
raise
except Exception, x: except Exception, x:
raise SSHException('Error reading SSH protocol banner' + str(x)) raise SSHException('Error reading SSH protocol banner' + str(x))
if buf[:4] == 'SSH-': if buf[:4] == 'SSH-':