summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2012-11-05 17:31:17 -0800
committerJeff Forcier <jeff@bitprophet.org>2012-11-05 17:31:17 -0800
commit0a276ac34bac3c9729992e3fdb3622d8916c5096 (patch)
tree889b80368acd533b9535d97b03166bdec8151651
parent394ab2699e254145e4904e1408036bb1683c14ca (diff)
Bubble up ProxyCommandFailure in packetizer
-rw-r--r--paramiko/packet.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/paramiko/packet.py b/paramiko/packet.py
index 97820619..5d918e2a 100644
--- a/paramiko/packet.py
+++ b/paramiko/packet.py
@@ -29,7 +29,7 @@ import time
from paramiko.common import *
from paramiko import util
-from paramiko.ssh_exception import SSHException
+from paramiko.ssh_exception import SSHException, ProxyCommandFailure
from paramiko.message import Message
@@ -254,6 +254,8 @@ class Packetizer (object):
retry_write = True
else:
n = -1
+ except ProxyCommandFailure:
+ raise # so it doesn't get swallowed by the below catchall
except Exception:
# could be: (32, 'Broken pipe')
n = -1