Cleanup: stop supporting duplicity < 0.6.01 (Redmine#2538).

diff --git a/ChangeLog b/ChangeLog
index 872f9747da54c98f31feff0955b8ee9c834873e1..6fcb7801e85a436fc556c4cec722a43d8726f45b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 version 0.9.10 -- UNRELEASED
     handler changes:
+       dup:
+        . Cleanup: stop supporting duplicity < 0.6.01 (Redmine#2538).
        sh:
         . Allow 'when = XXX' with spaces (Redmine#2769).
           Thanks to casper for the patch.

diff --git a/handlers/dup.in b/handlers/dup.in
index b58d34d80908e3e0780501292d622c788da78fd0..c4bf5249d111786ecd3eb52162d92af6f80f1f1d 100644 (file)
--- a/handlers/dup.in
+++ b/handlers/dup.in
@@ -155,9 +155,7 @@ else
 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
+execstr_options="${execstr_options} --extra-clean"
 
 ### Temporary directory
 if [ -n "$tmpdir" ]; then
@@ -172,12 +170,10 @@ if [ -n "$tmpdir" ]; then
 fi
 
 ### Archive directory
-# duplicity >= 0.6.01 enables the archive_dir by default, let's put it into /var/cache/backupninja/duplicity
+# duplicity now enables the archive_dir by default, let's put it into /var/cache/backupninja/duplicity
 # unless the user has specified it.
-if [ "$duplicity_major" -ge 0 -a "$duplicity_minor" -ge 6 -a "$duplicity_sub" -ge 1 ]; then
-   if echo "${options}" | grep -qv -- "--archive-dir" ; then
-      execstr_options="${execstr_options} --archive-dir /var/cache/backupninja/duplicity"
-   fi
+if echo "${options}" | grep -qv -- "--archive-dir" ; then
+   execstr_options="${execstr_options} --archive-dir /var/cache/backupninja/duplicity"
 fi
 
 ### Cleanup old backup sets (or not)