Skip to content
Snippets Groups Projects
Commit c18c24b4 authored by intrigeri's avatar intrigeri
Browse files

dup: warn about bandwithlimit being unused when desturl is set

parent f0caa9cc
Branches
Tags
No related merge requests found
...@@ -121,8 +121,8 @@ exclude = /home/*/.gnupg ...@@ -121,8 +121,8 @@ exclude = /home/*/.gnupg
#keep = yes #keep = yes
# full destination URL, in duplicity format; if set, desturl overrides # full destination URL, in duplicity format; if set, desturl overrides
# sshoptions, destdir, desthost and destuser, and disables testconnect # sshoptions, destdir, desthost and destuser; it also disables testconnect and
# For details, see duplicity manpage, section "URL FORMAT". # bandwithlimit. For details, see duplicity manpage, section "URL FORMAT".
#desturl = file:///usr/local/backup #desturl = file:///usr/local/backup
#desturl = rsync://user@other.host//var/backup/bla #desturl = rsync://user@other.host//var/backup/bla
......
...@@ -398,8 +398,8 @@ incremental = $dup_incremental ...@@ -398,8 +398,8 @@ incremental = $dup_incremental
keep = $dup_keep keep = $dup_keep
# full destination URL, in duplicity format; if set, desturl overrides # full destination URL, in duplicity format; if set, desturl overrides
# sshoptions, destdir, desthost and destuser, and disables testconnect # sshoptions, destdir, desthost and destuser; it also disables testconnect and
# For details, see duplicity manpage, section "URL FORMAT". # bandwithlimit. For details, see duplicity manpage, section "URL FORMAT".
#desturl = file:///usr/local/backup #desturl = file:///usr/local/backup
#desturl = rsync://user@other.host//var/backup/bla #desturl = rsync://user@other.host//var/backup/bla
......
...@@ -105,7 +105,10 @@ duplicity_sub="`echo $duplicity_version | @AWK@ -F '.' '{print $3}'`" ...@@ -105,7 +105,10 @@ duplicity_sub="`echo $duplicity_version | @AWK@ -F '.' '{print $3}'`"
# --sftp-command ourselves # --sftp-command ourselves
scpoptions="$sshoptions" scpoptions="$sshoptions"
[ "$bandwidthlimit" == 0 ] || scpoptions="$scpoptions -l $bandwidthlimit" if [ "$bandwidthlimit" =! 0 ]; then
[ -z "$testurl" ] || warning 'The bandwidthlimit option is not used when desturl is set.'
scpoptions="$scpoptions -l $bandwidthlimit"
fi
# < 0.4.2 : only uses ssh and scp # < 0.4.2 : only uses ssh and scp
if [ "$duplicity_major" -le 0 -a "$duplicity_minor" -le 4 -a "$duplicity_sub" -lt 2 ]; then if [ "$duplicity_major" -le 0 -a "$duplicity_minor" -le 4 -a "$duplicity_sub" -lt 2 ]; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment