← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Jonathan Riddell
  • Date: 2011-06-22 11:20:03 UTC
  • mto: This revision was merged to the branch mainline in revision 6003.
  • Revision ID: jriddell@canonical.com-20110622112003-fnwrezf919ofbwij
add a config option to validate signatures

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2438
2438
            else:
2439
2439
                revision = change
2440
2440
 
2441
 
        if signatures:
2442
 
            try:
2443
 
                import gpgme
2444
 
            except ImportError, error:
2445
 
                raise errors.GpgmeNotInstalled(error)
2446
 
 
2447
2441
        file_ids = []
2448
2442
        filter_by_dir = False
2449
2443
        if file_list:
2476
2470
            self.add_cleanup(b.lock_read().unlock)
2477
2471
            rev1, rev2 = _get_revision_range(revision, b, self.name())
2478
2472
 
 
2473
        if b.get_config().validate_signatures_in_log():
 
2474
            signatures = True
 
2475
 
 
2476
        if signatures:
 
2477
            try:
 
2478
                import gpgme
 
2479
            except ImportError, error:
 
2480
                raise errors.GpgmeNotInstalled(error)
 
2481
 
 
2482
 
2479
2483
        # Decide on the type of delta & diff filtering to use
2480
2484
        # TODO: add an --all-files option to make this configurable & consistent
2481
2485
        if not verbose: