~bzr-pqm/bzr/bzr.dev

Committer: Reagan Sanders
Date: 2013-07-28 17:21:04 UTC
mto: This revision was merged to the branch mainline in revision 6594.
Revision ID: vexofp@gmail.com-20130728172104-pvesr534vi12ufpm

Fix an issue with UTF characters in GPG names. We were trying to stick the UTF strings from the GPG subsystem into plain ASCII format strings. Changed the format strings to be UTF as well.

files modified:
bzrlib/log.py

Show diffs side-by-side

added added

removed removed

bzrlib/log.py

334

gpg_strategy = gpg.GPGStrategy(None)

335

result = repo.verify_revision_signature(rev_id, gpg_strategy)

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

if result[0] == gpg.SIGNATURE_KEY_MISSING:

339

return "unknown key {0}".format(result[1])

339

return u"unknown key {0}".format(result[1])

340

if result[0] == gpg.SIGNATURE_NOT_VALID:

341

return "invalid signature!"

342

if result[0] == gpg.SIGNATURE_NOT_SIGNED:

Older »