← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

  • Committer: John Arbash Meinel
  • Date: 2013-06-24 12:03:12 UTC
  • mfrom: (6437.77.2 2.5)
  • mto: This revision was merged to the branch mainline in revision 6579.
  • Revision ID: john@arbash-meinel.com-20130624120312-pmvck24x052csigx
Merge lp:bzr/2.5 r6515 to get the fix for bug #855155 (Dirstate.update_basis_by_delta)

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 u"valid signature from {0}".format(result[1])
 
337
        return "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: