/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/transport/ssh.py

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/ssh.py
195
195
        server_key = t.get_remote_server_key()
196
196
        server_key_hex = paramiko.util.hexify(server_key.get_fingerprint())
197
197
        keytype = server_key.get_name()
198
 
        if SYSTEM_HOSTKEYS.has_key(host) and SYSTEM_HOSTKEYS[host].has_key(keytype):
 
198
        if host in SYSTEM_HOSTKEYS and keytype in SYSTEM_HOSTKEYS[host]:
199
199
            our_server_key = SYSTEM_HOSTKEYS[host][keytype]
200
200
            our_server_key_hex = paramiko.util.hexify(our_server_key.get_fingerprint())
201
 
        elif BZR_HOSTKEYS.has_key(host) and BZR_HOSTKEYS[host].has_key(keytype):
 
201
        elif host in BZR_HOSTKEYS and keytype in BZR_HOSTKEYS[host]:
202
202
            our_server_key = BZR_HOSTKEYS[host][keytype]
203
203
            our_server_key_hex = paramiko.util.hexify(our_server_key.get_fingerprint())
204
204
        else:
205
205
            warning('Adding %s host key for %s: %s' % (keytype, host, server_key_hex))
206
 
            if not BZR_HOSTKEYS.has_key(host):
 
206
            if host not in BZR_HOSTKEYS:
207
207
                BZR_HOSTKEYS[host] = {}
208
208
            BZR_HOSTKEYS[host][keytype] = server_key
209
209
            our_server_key = server_key