aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-03-06 19:25:27 +0100
committerintrigeri <intrigeri@boum.org>2010-03-06 19:25:27 +0100
commit1cd91839c360931fc97bdef0b31d7887218d00ed (patch)
treeeaf7a0f37d15339d6939fd109b85c9ab8ad8c24b
parent7dce2f1138796cfb78c22a402b6039bdf76d4220 (diff)
downloadbackupninja-1cd91839c360931fc97bdef0b31d7887218d00ed.tar.gz
backupninja-1cd91839c360931fc97bdef0b31d7887218d00ed.tar.bz2
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
-rw-r--r--ChangeLog4
-rw-r--r--handlers/dup.in5
2 files changed, 9 insertions, 0 deletions
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