aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2011-09-11 00:18:23 +0200
committerintrigeri <intrigeri@boum.org>2011-09-11 00:18:23 +0200
commit5d94e2ad0d54be54476885ad199ab61de2d1a02e (patch)
tree42ab89d607444bb8c6331e690e1e3a5d26d58fd4
parentc43aa3697b5552de46b1c4b78f6edfddc1173e43 (diff)
downloadbackupninja-5d94e2ad0d54be54476885ad199ab61de2d1a02e.tar.gz
backupninja-5d94e2ad0d54be54476885ad199ab61de2d1a02e.tar.bz2
dup: fix incorrect duplicity version check for keepincroffulls.
Thanks to Olivier Berger <oberger@ouvaton.org> for the patch. (Closes Redmine bug #3443) (Closes: #641120)
-rw-r--r--ChangeLog4
-rw-r--r--handlers/dup.in2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4953418..114ec40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@ version 0.9.10 -- UNRELEASED
handler changes:
dup:
. Cleanup: stop supporting duplicity < 0.6.01 (Redmine#2538).
+ . Fix incorrect duplicity version check for keepincroffulls.
+ Thanks to Olivier Berger <oberger@ouvaton.org> for the patch.
+ (Closes Redmine bug #3443)
+ (Closes: #641120)
rsync:
. Fixing $rsync_options output when rsync is local
(Closes Redmine bug #3001)
diff --git a/handlers/dup.in b/handlers/dup.in
index c4bf524..40f6723 100644
--- a/handlers/dup.in
+++ b/handlers/dup.in
@@ -275,7 +275,7 @@ fi
# remove-all-inc-of-but-n-full : remove increments of older full backups : only keep latest ones
if [ "$keep" != "yes" ]; then
if [ "$keepincroffulls" != "all" ]; then
- if [ "$duplicity_major" -ge 0 -a "$duplicity_minor" -ge 9 -a "$duplicity_sub" -ge 10 ]; then
+ if [ "$duplicity_major" -ge 0 -a "$duplicity_minor" -ge 6 -a "$duplicity_sub" -ge 10 ]; then
debug "$precmd duplicity remove-all-inc-of-but-n-full $keepincroffulls --force $execstr_options $execstr_serverpart"
if [ ! $test ]; then
export PASSPHRASE=$password