diff options
| author | intrigeri <intrigeri@boum.org> | 2011-08-17 12:31:30 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2011-08-17 12:31:30 +0200 |
| commit | 7b57f84a92c9901054ba3148401521903f723fa9 (patch) | |
| tree | 529ec777ebc2ad0b337910a32e8e9913e654e8c3 | |
| parent | e691eb7a10d1ed618cb670886340b55ad5b7686a (diff) | |
| download | backupninja-7b57f84a92c9901054ba3148401521903f723fa9.tar.gz backupninja-7b57f84a92c9901054ba3148401521903f723fa9.tar.bz2 | |
Cleanup: stop supporting duplicity < 0.6.01 (Redmine#2538).
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | handlers/dup.in | 12 |
2 files changed, 6 insertions, 8 deletions
@@ -1,5 +1,7 @@ version 0.9.10 -- UNRELEASED handler changes: + dup: + . Cleanup: stop supporting duplicity < 0.6.01 (Redmine#2538). sh: . Allow 'when = XXX' with spaces (Redmine#2769). Thanks to casper for the patch. diff --git a/handlers/dup.in b/handlers/dup.in index b58d34d..c4bf524 100644 --- a/handlers/dup.in +++ b/handlers/dup.in @@ -155,9 +155,7 @@ else fi ### Cleanup options -if [ "$duplicity_major" -ge 0 -a "$duplicity_minor" -ge 6 -a "$duplicity_sub" -ge 1 ]; then - execstr_options="${execstr_options} --extra-clean" -fi +execstr_options="${execstr_options} --extra-clean" ### Temporary directory if [ -n "$tmpdir" ]; then @@ -172,12 +170,10 @@ if [ -n "$tmpdir" ]; then fi ### Archive directory -# duplicity >= 0.6.01 enables the archive_dir by default, let's put it into /var/cache/backupninja/duplicity +# duplicity now enables the archive_dir by default, let's put it into /var/cache/backupninja/duplicity # unless the user has specified it. -if [ "$duplicity_major" -ge 0 -a "$duplicity_minor" -ge 6 -a "$duplicity_sub" -ge 1 ]; then - if echo "${options}" | grep -qv -- "--archive-dir" ; then - execstr_options="${execstr_options} --archive-dir /var/cache/backupninja/duplicity" - fi +if echo "${options}" | grep -qv -- "--archive-dir" ; then + execstr_options="${execstr_options} --archive-dir /var/cache/backupninja/duplicity" fi ### Cleanup old backup sets (or not) |