← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit_signature_commands.py

  • Committer: Jonathan Riddell
  • Date: 2011-06-23 11:34:56 UTC
  • mto: This revision was merged to the branch mainline in revision 6003.
  • Revision ID: jriddell@canonical.com-20110623113456-42jg3xpphkymwraf
move some code from cmd_verify to gpg.set_acceptable_keys

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit_signature_commands.py
122
122
        branch_config = branch.get_config()
123
123
        gpg_strategy = gpg.GPGStrategy(branch_config)
124
124
 
125
 
        acceptable_keys_config = branch_config.acceptable_keys()
126
 
        try:
127
 
            acceptable_keys_config = str(acceptable_keys_config)
128
 
        except UnicodeEncodeError:
129
 
            raise errors.BzrCommandError('Only ASCII permitted in option names')
130
 
 
131
 
        if acceptable_keys_config is not None:
132
 
            gpg_strategy.set_acceptable_keys(acceptable_keys_config)
133
 
        if acceptable_keys is not None: #command line overrides config
134
 
            gpg_strategy.set_acceptable_keys(acceptable_keys)
135
 
 
 
125
        gpg_strategy.set_acceptable_keys(acceptable_keys)
136
126
        count = {gpg.SIGNATURE_VALID: 0,
137
127
                 gpg.SIGNATURE_KEY_MISSING: 0,
138
128
                 gpg.SIGNATURE_NOT_VALID: 0,