/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: 2017-07-04 20:03:11 UTC
  • mto: This revision was merged to the branch mainline in revision 6729.
  • Revision ID: jelmer@jelmer.uk-20170704200311-7aj6oger5labqyoy
https://launchpad.net/bugs/847388
Sign using python-gpg rather than command-line gpg.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/config.py
27
27
email=Your Name <your@email.address>
28
28
check_signatures=require|ignore|check-available(default)
29
29
create_signatures=always|never|when-required(default)
30
 
gpg_signing_command=name-of-program
31
30
log_format=name-of-format
32
31
validate_signatures_in_log=true|false(default)
33
32
acceptable_keys=pattern1,pattern2
798
797
        else:
799
798
            return None
800
799
 
801
 
    def _gpg_signing_command(self):
802
 
        """See Config.gpg_signing_command."""
803
 
        return self._get_user_option('gpg_signing_command')
804
 
 
805
800
    def _log_format(self):
806
801
        """See Config.log_format."""
807
802
        return self._get_user_option('log_format')
1314
1309
    def remove_user_option(self, option_name, section_name=None):
1315
1310
        self._get_branch_data_config().remove_option(option_name, section_name)
1316
1311
 
1317
 
    def _gpg_signing_command(self):
1318
 
        """See Config.gpg_signing_command."""
1319
 
        return self._get_safe_value('_gpg_signing_command')
1320
 
 
1321
1312
    def _post_commit(self):
1322
1313
        """See Config.post_commit."""
1323
1314
        return self._get_safe_value('_post_commit')
2706
2697
    Option('email', override_from_env=['BRZ_EMAIL'], default=default_email,
2707
2698
           help='The users identity'))
2708
2699
option_registry.register(
2709
 
    Option('gpg_signing_command',
2710
 
           default='gpg',
2711
 
           help="""\
2712
 
Program to use use for creating signatures.
2713
 
 
2714
 
This should support at least the -u and --clearsign options.
2715
 
"""))
2716
 
option_registry.register(
2717
2700
    Option('gpg_signing_key',
2718
2701
           default=None,
2719
2702
           help="""\