dup: added option --force to cleanup and remove-older-than commands, else they actual...

diff --git a/handlers/dup.in b/handlers/dup.in
index 89db671a3fd9f70b62891091fbd11c48705c2c91..9c6a4937a5e06afc2d04d2b0affc249860352292 100644 (file)
--- a/handlers/dup.in
+++ b/handlers/dup.in
@@ -221,12 +221,12 @@ execstr_source=${execstr_source//\\*/\\\\\\*}
 
 # cleanup
 if [ "$duplicity_major" -ge 0 -a "$duplicity_minor" -ge 4 -a "$duplicity_sub" -ge 4 ]; then
 
 # cleanup
 if [ "$duplicity_major" -ge 0 -a "$duplicity_minor" -ge 4 -a "$duplicity_sub" -ge 4 ]; then

-   debug "$precmd duplicity cleanup $execstr_options $execstr_serverpart"
+   debug "$precmd duplicity cleanup --force $execstr_options $execstr_serverpart"

    if [ ! $test ]; then
       export PASSPHRASE=$password
       output=`nice -n $nicelevel \
          su -c \
    if [ ! $test ]; then
       export PASSPHRASE=$password
       output=`nice -n $nicelevel \
          su -c \

-         "$precmd duplicity cleanup $execstr_options $execstr_serverpart 2>&1"`
+         "$precmd duplicity cleanup --force $execstr_options $execstr_serverpart 2>&1"`

       exit_code=$?
       if [ $exit_code -eq 0 ]; then
         debug $output
       exit_code=$?
       if [ $exit_code -eq 0 ]; then
         debug $output


@@ -241,12 +241,12 @@ fi
 # remove-older-than
 if [ "$keep" != "yes" ]; then
    if [ "$duplicity_major" -ge 0 -a "$duplicity_minor" -ge 4 -a "$duplicity_sub" -ge 4 ]; then
 # remove-older-than
 if [ "$keep" != "yes" ]; then
    if [ "$duplicity_major" -ge 0 -a "$duplicity_minor" -ge 4 -a "$duplicity_sub" -ge 4 ]; then

-      debug "$precmd duplicity remove-older-than $keep $execstr_options $execstr_serverpart"
+      debug "$precmd duplicity remove-older-than $keep --force $execstr_options $execstr_serverpart"

       if [ ! $test ]; then
          export PASSPHRASE=$password
         output=`nice -n $nicelevel \
                    su -c \
       if [ ! $test ]; then
          export PASSPHRASE=$password
         output=`nice -n $nicelevel \
                    su -c \

-                      "$precmd duplicity remove-older-than $keep $execstr_options $execstr_serverpart 2>&1"`
+                      "$precmd duplicity remove-older-than $keep --force $execstr_options $execstr_serverpart 2>&1"`

         exit_code=$?
         if [ $exit_code -eq 0 ]; then
            debug $output
         exit_code=$?
         if [ $exit_code -eq 0 ]; then
            debug $output