Merge lp:~spiv/bzr/ssh-connect-socket-error into lp:bzr
Proposed by
Andrew Bennetts
Status: | Merged |
---|---|
Approved by: | Vincent Ladeuil |
Approved revision: | no longer in the source branch. |
Merged at revision: | 5438 |
Proposed branch: | lp:~spiv/bzr/ssh-connect-socket-error |
Merge into: | lp:bzr |
Diff against target: |
67 lines (+7/-19) 2 files modified
NEWS (+3/-0) bzrlib/transport/ssh.py (+4/-19) |
To merge this branch: | bzr merge lp:~spiv/bzr/ssh-connect-socket-error |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Vincent Ladeuil | Approve | ||
Review via email: mp+35784@code.launchpad.net |
Commit message
Simplify connect_ssh/sftp error handling
Description of the change
test_bad_
Looking at the code, I don't know what the separate handling of EPIPE is trying to achieve, so here's a patch to just keep the error handling during connect_ssh/sftp simple and consistent.
To post a comment you must log in.
Let's try that and monitor the failures on hardy.
AIUI this shouldn't occur outside of tests so is pretty safe to try.