From 5d94e2ad0d54be54476885ad199ab61de2d1a02e Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sun, 11 Sep 2011 00:18:23 +0200 Subject: dup: fix incorrect duplicity version check for keepincroffulls. Thanks to Olivier Berger for the patch. (Closes Redmine bug #3443) (Closes: #641120) --- ChangeLog | 4 ++++ handlers/dup.in | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 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 -- cgit v1.2.3