/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

  • Committer: Andrew Bennetts
  • Date: 2009-06-17 02:02:44 UTC
  • mfrom: (4449 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4452.
  • Revision ID: andrew.bennetts@canonical.com-20090617020244-50aantdf95aakvjx
Merge bzr.dev, resolving NEWS conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/ssh.py
18
18
"""Foundation SSH support for SFTP and smart server."""
19
19
 
20
20
import errno
 
21
import getpass
21
22
import os
22
23
import socket
23
24
import subprocess
461
462
    # paramiko requires a username, but it might be none if nothing was
462
463
    # supplied.  If so, use the local username.
463
464
    if username is None:
464
 
        username = auth.get_user('ssh', host, port=port)
465
 
 
 
465
        username = auth.get_user('ssh', host, port=port,
 
466
                                 default=getpass.getuser())
466
467
    if _use_ssh_agent:
467
468
        agent = paramiko.Agent()
468
469
        for key in agent.get_keys():