← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

  • Committer: Reagan Sanders
  • Date: 2013-08-11 20:22:29 UTC
  • mto: This revision was merged to the branch mainline in revision 6594.
  • Revision ID: vexofp@gmail.com-20130811202229-fn9zpjewqypdz5hr
Reverted the UTF change to the SIGNATURE_KEY_MISSING case, as the values here will always be a key ID, and that will never be non-ASCII.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
336
336
    if result[0] == gpg.SIGNATURE_VALID:
337
337
        return u"valid signature from {0}".format(result[1])
338
338
    if result[0] == gpg.SIGNATURE_KEY_MISSING:
339
 
        return u"unknown key {0}".format(result[1])
 
339
        return "unknown key {0}".format(result[1])
340
340
    if result[0] == gpg.SIGNATURE_NOT_VALID:
341
341
        return "invalid signature!"
342
342
    if result[0] == gpg.SIGNATURE_NOT_SIGNED: