← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lockdir.py

  • Committer: John Arbash Meinel
  • Date: 2006-09-29 20:24:37 UTC
  • mto: This revision was merged to the branch mainline in revision 2062.
  • Revision ID: john@arbash-meinel.com-20060929202437-b96f6064b8ad4ab6
Switch extract_email_address() to use a more specific exception

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockdir.py
347
347
        config = bzrlib.config.GlobalConfig()
348
348
        try:
349
349
            user = config.user_email()
350
 
        except errors.BzrError:
 
350
        except errors.NoEmailInUsername:
351
351
            user = config.username()
352
352
        s = Stanza(hostname=socket.gethostname(),
353
353
                   pid=str(os.getpid()),