dup: more or less support duplicity 0.4.2 (bandwidthlimit maybe not working anymore...

git-svn-id: http://code.autistici.org/svn/backupninja/trunk@398 758a04ac-41e6-0310-8a23-8373a73cc35d

diff --git a/NEWS b/NEWS
index fbf66549baa8331249f92a98c43331bc80b86cc8..7b262c4397f9b8d29398bc7ea3403f18c241cf1a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 WARNING FOR DUPLICITY USERS
 
-Old (pre-0.9.4) example.dup file used to give false information about the way
-the GnuPG-related options are used. Please read the new example.dup file, and
-update your own configuration files if needed.
+1. Old (pre-0.9.4) example.dup file used to give false information about the way
+   the GnuPG-related options are used. Please read the new example.dup file, and
+   update your own configuration files if needed.
+
+2. The bandwidthlimit option does not work anymore with duplicity >=0.4.2.
+   Trying to solve this...

diff --git a/examples/example.dup b/examples/example.dup
index b90655140c1b56626eb3f6fc2fd6ea82f11d9a66..539a7ab83efb317addc09d8d2076c1a4f785e245 100644 (file)
--- a/examples/example.dup
+++ b/examples/example.dup
@@ -105,6 +105,7 @@ exclude = /home/*/.gnupg
 #keep = yes
 
 # bandwith limit, in kbit/s ; default is 0, i.e. no limit
+# NB: does not work anymore with duplicity >=0.4.2, work in progress to fix this
 #bandwidthlimit = 128
 
 # passed directly to ssh and scp

diff --git a/handlers/dup b/handlers/dup
index 7c8a7c6383c78c207a547d323d14fc0160a3e49e..59bb9bf082cd5c763cde9b6c9e7434f280c0d6c3 100644 (file)
--- a/handlers/dup
+++ b/handlers/dup
@@ -53,6 +53,7 @@ else
    [ -z "$vsinclude" ] || warning 'vservers support disabled in backupninja.conf, vsincludes configuration lines will be ignored'
 fi
 
+
 ### see if we can login ###
 
 if [ "$testconnect" == "yes" ]; then
@@ -69,10 +70,23 @@ fi
 
 ### COMMAND-LINE MANGLING ###
 
+# duplicity >= 0.4.2 needs --sftp-command (NB: sftp does not support the -l option)
+duplicity_version="`duplicity --version | awk '{print $2}'`"
+duplicity_major="`echo $duplicity_version | awk -F '.' '{print $1}'`"
+duplicity_minor="`echo $duplicity_version | awk -F '.' '{print $2}'`"
+duplicity_sub="`echo $duplicity_version | awk -F '.' '{print $3}'`"
+if [ "$duplicity_major" -ge 0 -a "$duplicity_minor" -ge 4 -a "$duplicity_sub" -ge 2 ]; then
+   sftpoptions="$sshoptions"
+fi
+
 scpoptions="$sshoptions"
 [ "$bandwidthlimit" == 0 ] || scpoptions="$scpoptions -l $bandwidthlimit"
 
-execstr="$options --no-print-statistics --scp-command 'scp $scpoptions' --ssh-command 'ssh $sshoptions' "
+if [ -z "$sftpoptions" ]; then
+   execstr="$options --no-print-statistics --scp-command 'scp $scpoptions' --ssh-command 'ssh $sshoptions' "
+else
+   execstr="$options --no-print-statistics --scp-command 'scp $scpoptions' --sftp-command 'sftp $sftpoptions' --ssh-command 'ssh $sshoptions' "
+fi
 
 # deal with symmetric or asymmetric (public/private key pair) encryption
 if [ -n "$encryptkey" ]; then

diff --git a/handlers/dup.helper b/handlers/dup.helper
index a18063dbd507de83a7e6b4f242a0c673c159ee6b..b366b538a9f40e4b00b4d959c082a8d2ba390cb3 100644 (file)
--- a/handlers/dup.helper
+++ b/handlers/dup.helper
@@ -398,6 +398,7 @@ incremental = $dup_incremental
 keep = $dup_keep
 
 # bandwith limit, in kbit/s ; default is 0, i.e. no limit
+# NB: does not work anymore with duplicity >=0.4.2, work in progress to fix this
 #bandwidthlimit = 128
 bandwidthlimit = $dup_bandwidth