← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

  • Committer: Vincent Ladeuil
  • Date: 2016-01-21 10:50:35 UTC
  • mfrom: (6609 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6610.
  • Revision ID: v.ladeuil+lp@free.fr-20160121105035-r67vcb49o142g2li
Merge trunk

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: