From 7b57f84a92c9901054ba3148401521903f723fa9 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Wed, 17 Aug 2011 12:31:30 +0200
Subject: Cleanup: stop supporting duplicity < 0.6.01 (Redmine#2538).

---
 ChangeLog       |  2 ++
 handlers/dup.in | 12 ++++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 872f974..6fcb780 100644
--- 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 b58d34d..c4bf524 100644
--- 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)
-- 
cgit v1.2.3