/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/lockdir.py

  • Committer: Vincent Ladeuil
  • Date: 2010-04-20 14:04:54 UTC
  • mto: (5169.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5170.
  • Revision ID: v.ladeuil+lp@free.fr-20100420140454-ixobg867y79ink8w
Final import fixes for bt.test_diff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockdir.py
447
447
        # XXX: is creating this here inefficient?
448
448
        config = bzrlib.config.GlobalConfig()
449
449
        try:
 
450
            user = config.user_email()
 
451
        except errors.NoEmailInUsername:
450
452
            user = config.username()
451
 
        except errors.NoWhoami:
452
 
            user = osutils.getuser_unicode()
453
453
        s = rio.Stanza(hostname=get_host_name(),
454
454
                   pid=str(os.getpid()),
455
455
                   start_time=str(int(time.time())),