/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-05-06 02:13:25 UTC
  • mfrom: (7490.7.21 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200506021325-awbmmqu1zyorz7sj
Merge 3.1 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/config.py
530
530
 
531
531
        Something similar to 'Martin Pool <mbp@sourcefrog.net>'
532
532
 
533
 
        $BRZ_EMAIL can be set to override this, then
 
533
        $BRZ_EMAIL or $BZR_EMAIL can be set to override this, then
534
534
        the concrete policy type is checked, and finally
535
535
        $EMAIL is examined.
536
536
        If no username can be found, NoWhoami exception is raised.
537
537
        """
538
 
        v = os.environ.get('BRZ_EMAIL')
 
538
        v = os.environ.get('BRZ_EMAIL') or os.environ.get('BZR_EMAIL')
539
539
        if v:
540
540
            return v
541
541
        v = self._get_user_id()
2514
2514
    Option('editor',
2515
2515
           help='The command called to launch an editor to enter a message.'))
2516
2516
option_registry.register(
2517
 
    Option('email', override_from_env=['BRZ_EMAIL'],
 
2517
    Option('email', override_from_env=['BRZ_EMAIL', 'BZR_EMAIL'],
2518
2518
           default=bedding.default_email, help='The users identity'))
2519
2519
option_registry.register(
2520
2520
    Option('gpg_signing_key',