Merge lp:~vila/bzr/1579093-paramako-compat into lp:bzr/2.7
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Vincent Ladeuil on 2016-11-28 | ||||
Approved revision: | 6619 | ||||
Merge reported by: | bzr PQM | ||||
Merged at revision: | not available | ||||
Proposed branch: | lp:~vila/bzr/1579093-paramako-compat | ||||
Merge into: | lp:bzr/2.7 | ||||
Diff against target: |
35 lines (+13/-1) 2 files modified
bzrlib/transport/sftp.py (+2/-1) doc/en/release-notes/bzr-2.7.txt (+11/-0) |
||||
To merge this branch: | bzr merge lp:~vila/bzr/1579093-paramako-compat | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Vincent Ladeuil | Approve on 2016-11-27 | ||
Review via email:
|
Commit message
Cope with paramiko making argument to SFTPFile.prefetch() mandatory.
Description of the change
This fixes bug #1579093 by coping with paramiko making argument to SFTPFile.prefetch() mandatory.
The original patch from Jelmer has landed in debian sid for a while as well as in ubuntu.
This is a pre-requisite to enable the new CI system as tests are currently failing on trunk.
Vincent Ladeuil (vila) wrote : | # |
Still sorting out bzr jenkaas issues. Please do *not* try to land this with pqm.
bzr PQM (bzr-pqm) wrote : | # |
The attempt to merge lp:~vila/bzr/1579093-paramako-compat into lp:bzr/2.7 failed. Below is the output from the failed tests.
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
python tools/rst2html.py --link-stylesheet --footnote-
Vincent Ladeuil (vila) wrote : | # |
FAIL: bzrlib.
testtools.
INFO Requested to stop gracefully
250.591 Stopping SmartServerSock
INFO Requested to stop gracefully
}}}
Traceback (most recent call last):
File "/home/
""", flags=doctest.
File "/usr/lib/
raise mismatch_error
testtools.
INFO Requested to stop gracefully
... Stopping SmartServerSock
INFO Waiting for 1 client(s) to finish
Got:
INFO Requested to stop gracefully
250.591 Stopping SmartServerSock
Ha ! Known transient issue :-/
Self-approving as the patch is known to work and is blocking landings.