aboutsummaryrefslogtreecommitdiff
path: root/handlers
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2011-08-17 12:31:30 +0200
committerintrigeri <intrigeri@boum.org>2011-08-17 12:31:30 +0200
commit7b57f84a92c9901054ba3148401521903f723fa9 (patch)
tree529ec777ebc2ad0b337910a32e8e9913e654e8c3 /handlers
parente691eb7a10d1ed618cb670886340b55ad5b7686a (diff)
downloadbackupninja-7b57f84a92c9901054ba3148401521903f723fa9.tar.gz
backupninja-7b57f84a92c9901054ba3148401521903f723fa9.tar.bz2
Cleanup: stop supporting duplicity < 0.6.01 (Redmine#2538).
Diffstat (limited to 'handlers')
-rw-r--r--handlers/dup.in12
1 files changed, 4 insertions, 8 deletions
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)