~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/gpg.py

  • Committer: Vincent Ladeuil
  • Date: 2011-11-17 17:16:09 UTC
  • mfrom: (6272 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6273.
  • Revision ID: v.ladeuil+lp@free.fr-20111117171609-pzs107pdm0vndlf9
merge trunk to resolve conflicts on news

Show diffs side-by-side

added added

removed removed

Lines of Context:
105
105
        all_verifiable = True
106
106
        for rev_id in revisions:
107
107
            verification_result, uid =\
108
 
                                repository.verify_revision(rev_id,self)
 
108
                repository.verify_revision_signature(rev_id,self)
109
109
            result.append([rev_id, verification_result, uid])
110
110
            count[verification_result] += 1
111
111
            if verification_result != SIGNATURE_VALID:
358
358
        all_verifiable = True
359
359
        for rev_id in revisions:
360
360
            verification_result, uid =\
361
 
                                repository.verify_revision(rev_id,self)
 
361
                repository.verify_revision_signature(rev_id, self)
362
362
            result.append([rev_id, verification_result, uid])
363
363
            count[verification_result] += 1
364
364
            if verification_result != SIGNATURE_VALID: