From abf7a4bb651c5ec85306fca96a572dfc8a424edb Mon Sep 17 00:00:00 2001
From: Olivier Berger <olivier.berger@it-sudparis.eu>
Date: Sun, 2 May 2010 17:40:50 +0200
Subject: Implement Debian #535996 to use --full-if-older-than

---
 handlers/dup.in | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'handlers/dup.in')

diff --git a/handlers/dup.in b/handlers/dup.in
index 0b14ef9..16b5af2 100644
--- a/handlers/dup.in
+++ b/handlers/dup.in
@@ -24,6 +24,7 @@ getconf exclude
 
 setsection dest
 getconf incremental yes
+getconf increments 30
 getconf keep 60
 getconf desturl
 getconf awsaccesskeyid
@@ -164,14 +165,13 @@ if [ "$incremental" == "no" ]; then
       execstr_command="full"
    fi
 else
-   if [ "$keep" != "yes" ]; then
-      fullifolderthan="30D"
-      if [ "`echo $keep | tr -d 0-9`" == "" ]; then
-         #let "fullifolderthan = keep / 2"
-         fullifolderthan=$(($keep / 2))
-         fullifolderthan="${fullifolderthan}D"
+   # we're in incremental mode
+   if [ "$increments" != "keep" ]; then
+      # if we don't want to keep every increments
+      if [ "`echo $increments | tr -d 0-9`" == "" ]; then
+         increments="${increments}D"
       fi
-      execstr_options="${execstr_options} --full-if-older-than $fullifolderthan"
+      execstr_options="${execstr_options} --full-if-older-than $increments"
    fi
 fi
 
-- 
cgit v1.2.3