← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/launchpad/account.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-16 19:18:39 UTC
  • mto: This revision was merged to the branch mainline in revision 6391.
  • Revision ID: jelmer@samba.org-20111216191839-eg681lxqibi1qxu1
Fix remaining tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/account.py
26
26
    transport,
27
27
    )
28
28
from bzrlib.config import AuthenticationConfig, GlobalConfig
29
 
 
 
29
from bzrlib.i18n import gettext
30
30
 
31
31
LAUNCHPAD_BASE = 'https://launchpad.net/'
32
32
 
61
61
        auth_username = _get_auth_user(auth)
62
62
        # Auto-upgrading
63
63
        if auth_username is None:
64
 
            trace.note('Setting ssh/sftp usernames for launchpad.net.')
 
64
            trace.note(gettext('Setting ssh/sftp usernames for launchpad.net.'))
65
65
            _set_auth_user(username, auth)
66
66
        elif auth_username != username:
67
67
            raise MismatchedUsernames()
100
100
    uploaded SSH keys.
101
101
    """
102
102
    if _transport is None:
103
 
        _transport = transport.get_transport(LAUNCHPAD_BASE)
 
103
        _transport = transport.get_transport_from_url(LAUNCHPAD_BASE)
104
104
 
105
105
    try:
106
106
        data = _transport.get_bytes('~%s/+sshkeys' % username)