Support bandwidthlimit again with new duplicity, using trickle.

duplicity 0.6.17 uses paramiko backend.
Thus, it does not support limiting bandwidth anymore.
Let's use trickle to support bandwidth shaping anyway.
This commit is contained in:
intrigeri 2012-01-29 14:40:46 +01:00
parent f896ef3f65
commit 5bfa30bb22
2 changed files with 6 additions and 0 deletions

View File

@ -14,6 +14,7 @@ version 1.0 -- UNRELEASED
example.dup.
. Add support for RackSpace's CloudFiles.
Thanks to Yuval Kogman <nothingmuch@woobling.org> for the patch.
. Support bandwidthlimit with new duplicity, using trickle.
mysql:
. Don't attempt to dump performance_schema database (Redmine#3741).
build system changes

View File

@ -122,6 +122,11 @@ if [ "$duplicity_major" -ge 0 -a "$duplicity_minor" -ge 6 -a "$duplicity_sub" -g
|| warning 'duplicity >= 0.6.17 only supports the IdentityFile SSH option'
fi
execstr_options="${execstr_options} --ssh-options '$sshoptions'"
# FIXME: use trickle
if [ "$bandwidthlimit" != 0 ]; then
[ -z "$desturl" ] || warning 'The bandwidthlimit option is not used when desturl is set.'
execstr_precmd="trickle -s -d $bandwidthlimit -u $bandwidthlimit"
fi
## duplicity < 0.6.17 : scp/sftp backend
else
scpoptions="$sshoptions"