← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

  • Committer: Patch Queue Manager
  • Date: 2014-04-11 02:21:29 UTC
  • mfrom: (6583.4.5 fix-1123460)
  • Revision ID: pqm@pqm.ubuntu.com-20140411022129-msotfyulqna1qc4m
(richard-wilbur) Fix bug LP: #1123460,
 verify-signature crashes on non ascii characters (and on -v) (Reagan Sanders)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
334
334
    gpg_strategy = gpg.GPGStrategy(None)
335
335
    result = repo.verify_revision_signature(rev_id, gpg_strategy)
336
336
    if result[0] == gpg.SIGNATURE_VALID:
337
 
        return "valid signature from {0}".format(result[1])
 
337
        return u"valid signature from {0}".format(result[1])
338
338
    if result[0] == gpg.SIGNATURE_KEY_MISSING:
339
339
        return "unknown key {0}".format(result[1])
340
340
    if result[0] == gpg.SIGNATURE_NOT_VALID: