From: intrigeri Date: Sun, 29 Jun 2008 07:26:36 +0000 (+0000) Subject: dup: added option --force to cleanup and remove-older-than commands, else they actual... X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fbackupninja.git;a=commitdiff_plain;h=779140e22896e62960912986c35a5e6f5dc3b152 dup: added option --force to cleanup and remove-older-than commands, else they actually do not do anything git-svn-id: http://code.autistici.org/svn/backupninja/trunk@594 758a04ac-41e6-0310-8a23-8373a73cc35d --- diff --git a/handlers/dup.in b/handlers/dup.in index 89db671..9c6a493 100644 --- 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 - 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 \ - "$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 @@ -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 - 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 \ - "$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