Commit af4df4d3 authored by Michael Terry's avatar Michael Terry

merge from trunk

parents f7fafd06 aa592d68
......@@ -111,13 +111,13 @@ string default_args(BackupRunner br, Mode mode = Mode.NONE, bool encrypted = fal
var restoredir = Path.build_filename(test_home, "restore");
if (mode == Mode.CLEANUP)
return "cleanup '--force' 'file://%s' '--gio' '--no-encryption' '--verbosity=9' '--gpg-options=--no-use-agent' '--archive-dir=%s/deja-dup' '--log-fd=?'".printf(backupdir, cachedir);
return "cleanup '--force' 'file://%s' '--gio' %s'--verbosity=9' '--gpg-options=--no-use-agent' '--archive-dir=%s/deja-dup' '--log-fd=?'".printf(backupdir, encrypted ? "" : "'--no-encryption' ", cachedir);
else if (mode == Mode.RESTORE)
return "'restore' '--gio' '--force' 'file://%s' '%s' '--no-encryption' '--verbosity=9' '--gpg-options=--no-use-agent' '--archive-dir=%s/deja-dup' '--log-fd=?'".printf(backupdir, restoredir, cachedir);
return "'restore' '--gio' '--force' 'file://%s' '%s' %s'--verbosity=9' '--gpg-options=--no-use-agent' '--archive-dir=%s/deja-dup' '--log-fd=?'".printf(backupdir, restoredir, encrypted ? "" : "'--no-encryption' ", cachedir);
else if (mode == Mode.VERIFY)
return "'restore' '--file-to-restore=%s/deja-dup/metadata' '--gio' '--force' 'file://%s' '%s/deja-dup/metadata' '--no-encryption' '--verbosity=9' '--gpg-options=--no-use-agent' '--archive-dir=%s/deja-dup' '--log-fd=?'".printf(cachedir.substring(1), backupdir, cachedir, cachedir);
return "'restore' '--file-to-restore=%s/deja-dup/metadata' '--gio' '--force' 'file://%s' '%s/deja-dup/metadata' %s'--verbosity=9' '--gpg-options=--no-use-agent' '--archive-dir=%s/deja-dup' '--log-fd=?'".printf(cachedir.substring(1), backupdir, cachedir, encrypted ? "" : "'--no-encryption' ", cachedir);
else if (mode == Mode.LIST)
return "'list-current-files' '--gio' 'file://%s' '--no-encryption' '--verbosity=9' '--gpg-options=--no-use-agent' '--archive-dir=%s/deja-dup' '--log-fd=?'".printf(backupdir, cachedir);
return "'list-current-files' '--gio' 'file://%s' %s'--verbosity=9' '--gpg-options=--no-use-agent' '--archive-dir=%s/deja-dup' '--log-fd=?'".printf(backupdir, encrypted ? "" : "'--no-encryption' ", cachedir);
string source_str = "";
if (mode == Mode.DRY || mode == Mode.BACKUP)
......
......@@ -3,7 +3,7 @@ Type=backup
Passphrases=2
[Duplicity]
Runs=status 1;dry 1;status 2;dry 2;backup 1;status 3;dry 3;backup 2;
Runs=status 1;dry 1;status 2;dry 2;backup 1;status 3;dry 3;backup 2;status-restore;list;verify;
[Duplicity status 1]
#DEBUG 1
......@@ -46,3 +46,15 @@ Passphrase=true
[Duplicity backup 2]
Encrypted=true
Passphrase=true
[Duplicity status-restore]
Encrypted=true
Passphrase=true
[Duplicity list]
Encrypted=true
Passphrase=true
[Duplicity verify]
Encrypted=true
Passphrase=true
......@@ -2,7 +2,7 @@
Type=backup
[Duplicity]
Runs=status;dry;backup;
Runs=status;dry;backup;status-restore;list;verify;
[Duplicity status]
#DEBUG 1
......@@ -14,3 +14,14 @@ Encrypted=true
[Duplicity backup]
Encrypted=true
[Duplicity status-restore]
#DEBUG 1
#. ['duplicity.gpg']
Output=true
[Duplicity list]
Encrypted=true
[Duplicity verify]
Encrypted=true
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment