Merge lp:~andrewsomething/bzr/bts794146 into lp:bzr

Proposed by Andrew Starr-Bochicchio on 2015-07-31
Status: Merged
Approved by: Richard Wilbur on 2015-07-31
Approved revision: 6604
Merged at revision: 6606
Proposed branch: lp:~andrewsomething/bzr/bts794146
Merge into: lp:bzr
Diff against target: 60 lines (+9/-8)
1 file modified
bzrlib/transport/ssh.py (+9/-8)
To merge this branch: bzr merge lp:~andrewsomething/bzr/bts794146
Reviewer Review Type Date Requested Status
Richard Wilbur 2015-07-31 Approve on 2015-07-31
Review via email: mp+266499@code.launchpad.net

Commit message

Resolve Bug #1480015: Test failure: hexify removed from paramiko (Andrew Starr-Bochicchio)

Description of the change

To post a comment you must log in.
Richard Wilbur (richard-wilbur) wrote :

Thanks for noticing the problem, filing the bug, and providing a fix. I approve this merge request, but note that I have been trying to get the bzr Patch Queue Manager back up and running.
+1

(I posted Question #268568 [0] and then redirected to rt.ubuntu.com #26672. On 12 July 2015 I wrote the message I copy below.)

On Thu, Jul 2, 2015 at 10:50 AM, Jacek Nykis via RT <email address hidden> wrote:
> Hi Richard,
>
> We found another problem with bazaar PQM and are working on it.
>
> We will come back to you when it's resolved.
>
> Sorry for the delay.
>
> Regards,
> Jacek Nykis

Greetings Jacek, et al,

It's been 10 days and I haven't heard anything. Is there anything I
can do to help? My backlog of unmerged branches has grown from the
initial 2 to 4. This is important to the Bazaar (bzr) project as it
is part of the critical path for landing new branches.

Sincerely,
Richard

review: Approve
Richard Wilbur (richard-wilbur) wrote :

sent to pqm by email

Iain Lane (laney) wrote :

It looks like the pqm is working again - any idea how to get this branch merged?

Vincent Ladeuil (vila) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/transport/ssh.py'
2--- bzrlib/transport/ssh.py 2011-12-19 13:23:58 +0000
3+++ bzrlib/transport/ssh.py 2015-07-31 02:18:32 +0000
4@@ -26,6 +26,7 @@
5 import socket
6 import subprocess
7 import sys
8+from binascii import hexlify
9
10 from bzrlib import (
11 config,
12@@ -276,6 +277,9 @@
13 class ParamikoVendor(SSHVendor):
14 """Vendor that uses paramiko."""
15
16+ def _hexify(self, s):
17+ return hexlify(s).upper()
18+
19 def _connect(self, username, password, host, port):
20 global SYSTEM_HOSTKEYS, BZR_HOSTKEYS
21
22@@ -289,16 +293,14 @@
23 self._raise_connection_error(host, port=port, orig_error=e)
24
25 server_key = t.get_remote_server_key()
26- server_key_hex = paramiko.util.hexify(server_key.get_fingerprint())
27+ server_key_hex = self._hexify(server_key.get_fingerprint())
28 keytype = server_key.get_name()
29 if host in SYSTEM_HOSTKEYS and keytype in SYSTEM_HOSTKEYS[host]:
30 our_server_key = SYSTEM_HOSTKEYS[host][keytype]
31- our_server_key_hex = paramiko.util.hexify(
32- our_server_key.get_fingerprint())
33+ our_server_key_hex = self._hexify(our_server_key.get_fingerprint())
34 elif host in BZR_HOSTKEYS and keytype in BZR_HOSTKEYS[host]:
35 our_server_key = BZR_HOSTKEYS[host][keytype]
36- our_server_key_hex = paramiko.util.hexify(
37- our_server_key.get_fingerprint())
38+ our_server_key_hex = self._hexify(our_server_key.get_fingerprint())
39 else:
40 trace.warning('Adding %s host key for %s: %s'
41 % (keytype, host, server_key_hex))
42@@ -308,8 +310,7 @@
43 else:
44 BZR_HOSTKEYS.setdefault(host, {})[keytype] = server_key
45 our_server_key = server_key
46- our_server_key_hex = paramiko.util.hexify(
47- our_server_key.get_fingerprint())
48+ our_server_key_hex = self._hexify(our_server_key.get_fingerprint())
49 save_host_keys()
50 if server_key != our_server_key:
51 filename1 = os.path.expanduser('~/.ssh/known_hosts')
52@@ -505,7 +506,7 @@
53 agent = paramiko.Agent()
54 for key in agent.get_keys():
55 trace.mutter('Trying SSH agent key %s'
56- % paramiko.util.hexify(key.get_fingerprint()))
57+ % self._hexify(key.get_fingerprint()))
58 try:
59 paramiko_transport.auth_publickey(username, key)
60 return