/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 bzrlib/gpg.py

  • Committer: Jonathan Riddell
  • Date: 2011-09-16 15:39:47 UTC
  • mfrom: (6144 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6146.
  • Revision ID: jriddell@canonical.com-20110916153947-dl2qdlakcd2ximon
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/gpg.py
314
314
                acceptable_keys_config = str(acceptable_keys_config)
315
315
        except UnicodeEncodeError:
316
316
            #gpg Context.keylist(pattern) does not like unicode
317
 
            raise errors.BzrCommandError('Only ASCII permitted in option names')
 
317
            raise errors.BzrCommandError(gettext('Only ASCII permitted in option names'))
318
318
 
319
319
        if acceptable_keys_config is not None:
320
320
            key_patterns = acceptable_keys_config