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 2fbe7ed54a944e1b0e68c1204fce30e5d7428cb2..7b8d3831c58de2a0eaed4a3512c20a084d3cb061 100644 (file)
--- 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 ffae48c1bece695bcd2462f4bcc33e4929d34783..c8dfcba6480340122769725e0d23942f1b4ded04 100644 (file)
--- 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