dup: fix incorrect duplicity version check for keepincroffulls.

Thanks to Olivier Berger <oberger@ouvaton.org> for the patch.
(Closes Redmine bug #3443)
(Closes: #641120)

diff --git a/ChangeLog b/ChangeLog
index 4953418057ec40f09bd0a6006d6b07777e274371..114ec40d37290991e3849d71e99e919f2ddf3aad 100644 (file)
--- 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 c4bf5249d111786ecd3eb52162d92af6f80f1f1d..40f67235d323a91c1c6e0be2093d37cfadb27170 100644 (file)
--- 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