From: intrigeri Date: Sat, 6 Mar 2010 18:25:27 +0000 (+0100) Subject: dup: use duplicity's --extra-clean option when necessary X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=refs%2Fremotes%2Forigin%2Fmaster;p=matthijs%2Fupstream%2Fbackupninja.git dup: use duplicity's --extra-clean option when necessary This is necessary to get rid of unnecessary old cache files when cleaning up, when using duplicity >=0.6.01 that depends on local caching. Closes: #572721 --- diff --git a/ChangeLog b/ChangeLog index 2fbe7ed..7b8d383 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ version 0.9.8 -- UNRELEASED handler changes sys: . Only run mdadm if RAID devices actually exist (Closes: #572450) + dup: + . Use duplicity's --extra-clean option to get rid of unnecessary old + cache files when cleaning up. This is enabled when using duplicity + 0.6.01 or newer, that depends on local caching (Closes: #572721) version 0.9.7 -- January 27, 2010 backupninja changes diff --git a/handlers/dup.in b/handlers/dup.in index ffae48c..c8dfcba 100644 --- a/handlers/dup.in +++ b/handlers/dup.in @@ -165,6 +165,11 @@ if [ "$incremental" == "no" ]; then fi fi +### Cleanup options +if [ "$duplicity_major" -ge 0 -a "$duplicity_minor" -ge 6 -a "$duplicity_sub" -ge 1 ]; then + execstr_options="${execstr_options} --extra-clean" +fi + ### Temporary directory precmd= if [ -n "$tmpdir" ]; then