← Back to branch summary

~ed.so/duplicity/reuse-passphrase-for-signing-fix

« back to all changes in this revision

Viewing changes to duplicity-bin

  • Committer: loafman
  • Date: 2008-12-29 00:25:11 UTC
  • Revision ID: vcs-imports@canonical.com-20081229002511-r535rch1j77xhdlg
Use reldate expansion to include release date.

Show diffs side-by-side

added added

removed removed

Lines of Context:
duplicity-bin
2
2
# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*-
3
3
#
4
4
# duplicity -- Encrypted bandwidth efficient backup
5
 
# Version $version released September 29, 2002
 
5
# Version $version released $reldate
6
6
#
7
7
# Copyright (C) 2002 Ben Escoto <bescoto@stanford.edu>
8
8
#
46
46
 
47
47
def get_passphrase(n):
48
48
    """Get passphrase from environment or, failing that, from user
49
 
    
 
49
 
50
50
    If n=3, a password is requested and verified. If n=2, the current
51
51
    password is verified. If n=1, a password is requested without
52
52
    verification for the time being."""
235
235
        sig_outfp.close()
236
236
        col_stats.set_values(sig_chain_warning = None).cleanup_signatures()
237
237
    print_statistics(diffdir.stats, bytes_written)
238
 
    
 
238
 
239
239
 
240
240
def check_sig_chain(col_stats):
241
241
    """Get last signature chain for inc backup, or None if none available"""
296
296
    """Restore archive in globals.backend to globals.local_path"""
297
297
    if globals.dry_run:
298
298
      return
299
 
    if not patchdir.Write_ROPaths(globals.local_path, 
 
299
    if not patchdir.Write_ROPaths(globals.local_path,
300
300
                                  restore_get_patched_rop_iter(col_stats)):
301
301
        if globals.restore_dir:
302
302
            log.FatalError(_("%s not found in archive, no files restored.")
347
347
    tdp = dup_temp.new_tempduppath(parseresults)
348
348
    backend.get(filename, tdp)
349
349
    restore_check_hash(volume_info, tdp)
350
 
    
 
350
 
351
351
    fileobj = tdp.filtered_open_with_delete("rb")
352
352
    if parseresults.encrypted and globals.gpg_profile.sign_key:
353
353
        restore_add_sig_check(fileobj)
512
512
        action = "full"
513
513
 
514
514
    os.umask(077)
515
 
    
 
515
 
516
516
    # for public key encryption (without signing!), no passphrase is required.
517
517
 
518
518
    # cases where we do not need to get a passphrase: