dup: use --archive-dir /var/backups/duplicity unless the user has specified it (Closes: 580213)

This commit is contained in:
intrigeri 2010-05-06 19:27:18 +02:00
parent 25f50151e7
commit 33365d0953
2 changed files with 12 additions and 0 deletions

View File

@ -11,6 +11,9 @@ version 0.9.8 -- UNRELEASED
0.6.01 or newer, that depends on local caching (Closes: #572721)
. dup: ignore anything but digits and "." when comparing versions
(Closes: #578987)
. Put archive directory (cache) into /var/backups/duplicity rather
than the default /root/.cache/duplicity, unless the user
has specified it (Closes: 580213)
version 0.9.7 -- January 27, 2010
backupninja changes

View File

@ -193,6 +193,15 @@ if [ -n "$tmpdir" ]; then
precmd="${precmd}TMPDIR=$tmpdir "
fi
### Archive directory
# duplicity >= 0.6.01 enables the archive_dir by default, let's put it into /var/backups
# 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/backups/duplicity"
fi
fi
### Cleanup old backup sets (or not)
if [ "$keep" != "yes" ]; then
if [ "`echo $keep | tr -d 0-9`" == "" ]; then