← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1909
1909
        # display a warning if an email address isn't included in the given name.
1910
1910
        try:
1911
1911
            config.extract_email_address(name)
1912
 
        except BzrError, e:
 
1912
        except errors.NoEmailInUsername, e:
1913
1913
            warning('"%s" does not seem to contain an email address.  '
1914
1914
                    'This is allowed, but not recommended.', name)
1915
1915