← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lockdir.py

  • Committer: Jelmer Vernooij
  • Date: 2012-07-06 17:06:02 UTC
  • mto: This revision was merged to the branch mainline in revision 6535.
  • Revision ID: jelmer@samba.org-20120706170602-1r5m1una9oucwvah
Fix remaining tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockdir.py
858
858
    as it gives some clue who the user is.
859
859
    """
860
860
    try:
861
 
        return config.GlobalStack().get('email')
 
861
        return config.GlobalConfig().username()
862
862
    except errors.NoWhoami:
863
863
        return osutils.getuser_unicode()