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

[Andrew Starr-Bochicchio]

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

For https://bugs.launchpad.net/bzr/+bug/1480015

[Richard Wilbur (richard-wilbur)]

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)]

sent to pqm by email

[Iain Lane (laney)]

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

[Vincent Ladeuil (vila)]

sent to pqm by email

=== modified file 'bzrlib/transport/ssh.py'
--- bzrlib/transport/ssh.py	2011-12-19 13:23:58 +0000
+++ bzrlib/transport/ssh.py	2015-07-31 02:18:32 +0000
@@ -26,6 +26,7 @@
 import socket
 import subprocess
 import sys
+from binascii import hexlify
 
 from bzrlib import (
     config,
@@ -276,6 +277,9 @@
 class ParamikoVendor(SSHVendor):
     """Vendor that uses paramiko."""
 
+    def _hexify(self, s):
+        return hexlify(s).upper()
+
     def _connect(self, username, password, host, port):
         global SYSTEM_HOSTKEYS, BZR_HOSTKEYS
 
@@ -289,16 +293,14 @@
             self._raise_connection_error(host, port=port, orig_error=e)
 
         server_key = t.get_remote_server_key()
-        server_key_hex = paramiko.util.hexify(server_key.get_fingerprint())
+        server_key_hex = self._hexify(server_key.get_fingerprint())
         keytype = server_key.get_name()
         if host in SYSTEM_HOSTKEYS and keytype in SYSTEM_HOSTKEYS[host]:
             our_server_key = SYSTEM_HOSTKEYS[host][keytype]
-            our_server_key_hex = paramiko.util.hexify(
-                our_server_key.get_fingerprint())
+            our_server_key_hex = self._hexify(our_server_key.get_fingerprint())
         elif host in BZR_HOSTKEYS and keytype in BZR_HOSTKEYS[host]:
             our_server_key = BZR_HOSTKEYS[host][keytype]
-            our_server_key_hex = paramiko.util.hexify(
-                our_server_key.get_fingerprint())
+            our_server_key_hex = self._hexify(our_server_key.get_fingerprint())
         else:
             trace.warning('Adding %s host key for %s: %s'
                           % (keytype, host, server_key_hex))
@@ -308,8 +310,7 @@
             else:
                 BZR_HOSTKEYS.setdefault(host, {})[keytype] = server_key
             our_server_key = server_key
-            our_server_key_hex = paramiko.util.hexify(
-                our_server_key.get_fingerprint())
+            our_server_key_hex = self._hexify(our_server_key.get_fingerprint())
             save_host_keys()
         if server_key != our_server_key:
             filename1 = os.path.expanduser('~/.ssh/known_hosts')
@@ -505,7 +506,7 @@
         agent = paramiko.Agent()
         for key in agent.get_keys():
             trace.mutter('Trying SSH agent key %s'
-                         % paramiko.util.hexify(key.get_fingerprint()))
+                         % self._hexify(key.get_fingerprint()))
             try:
                 paramiko_transport.auth_publickey(username, key)
                 return