← 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: Martin
  • Date: 2010-05-16 15:18:43 UTC
  • mfrom: (5235 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5239.
  • Revision ID: gzlist@googlemail.com-20100516151843-lu53u7caehm3ie3i
Merge bzr.dev to resolve conflicts in NEWS and _chk_map_pyx

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/account.py
80
80
def _get_auth_user(auth=None):
81
81
    if auth is None:
82
82
        auth = AuthenticationConfig()
83
 
    return auth.get_user('ssh', '.launchpad.net')
 
83
    username = auth.get_user('ssh', '.launchpad.net')
 
84
    return username
84
85
 
85
86
def _set_auth_user(username, auth=None):
86
87
    if auth is None: