← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/ssh.py

  • Committer: Aaron Bentley
  • Date: 2007-08-20 13:07:12 UTC
  • mfrom: (2732 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2733.
  • Revision ID: abentley@panoramicfeedback.com-20070820130712-buopmg528zcgwyxc
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/ssh.py
524
524
    global SYSTEM_HOSTKEYS, BZR_HOSTKEYS
525
525
    try:
526
526
        SYSTEM_HOSTKEYS = paramiko.util.load_host_keys(os.path.expanduser('~/.ssh/known_hosts'))
527
 
    except Exception, e:
 
527
    except IOError, e:
528
528
        mutter('failed to load system host keys: ' + str(e))
529
529
    bzr_hostkey_path = pathjoin(config_dir(), 'ssh_host_keys')
530
530
    try:
531
531
        BZR_HOSTKEYS = paramiko.util.load_host_keys(bzr_hostkey_path)
532
 
    except Exception, e:
 
532
    except IOError, e:
533
533
        mutter('failed to load bzr host keys: ' + str(e))
534
534
        save_host_keys()
535
535