/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 breezy/config.py

  • Committer: Jelmer Vernooij
  • Date: 2020-06-15 01:29:36 UTC
  • mfrom: (7490.40.4 work)
  • mto: (7490.40.19 work)
  • mto: This revision was merged to the branch mainline in revision 7516.
  • Revision ID: jelmer@jelmer.uk-20200615012936-1adqbu592y7lzmy8
Merge upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/config.py
556
556
 
557
557
        Something similar to 'Martin Pool <mbp@sourcefrog.net>'
558
558
 
559
 
        $BRZ_EMAIL can be set to override this, then
 
559
        $BRZ_EMAIL or $BZR_EMAIL can be set to override this, then
560
560
        the concrete policy type is checked, and finally
561
561
        $EMAIL is examined.
562
562
        If no username can be found, NoWhoami exception is raised.
563
563
        """
564
 
        v = os.environ.get('BRZ_EMAIL')
 
564
        v = os.environ.get('BRZ_EMAIL') or os.environ.get('BZR_EMAIL')
565
565
        if v:
566
566
            if not PY3:
567
567
                v = v.decode(osutils.get_user_encoding())
2546
2546
    Option('editor',
2547
2547
           help='The command called to launch an editor to enter a message.'))
2548
2548
option_registry.register(
2549
 
    Option('email', override_from_env=['BRZ_EMAIL'],
 
2549
    Option('email', override_from_env=['BRZ_EMAIL', 'BZR_EMAIL'],
2550
2550
           default=bedding.default_email, help='The users identity'))
2551
2551
option_registry.register(
2552
2552
    Option('gpg_signing_key',