← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lockdir.py

  • Committer: Patch Queue Manager
  • Date: 2012-09-05 20:52:26 UTC
  • mfrom: (6549.3.1 dev_2.5_integration)
  • Revision ID: pqm@pqm.ubuntu.com-20120905205226-8s3bzolvduug3ifj
(gz) Merge 2.5 (Martin Packman)

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.GlobalConfig().username()
 
861
        return config.GlobalStack().get('email')
862
862
    except errors.NoWhoami:
863
863
        return osutils.getuser_unicode()