dup: checked that bandwidthlimit still works with duplicity 0.4.2, reflected

this into the docs/examples/Changelog

diff --git a/ChangeLog b/ChangeLog
index c563868812249c9dbf5c2f8681b3d3d7f1c7e035..b32d53e9a433a5ec6d19a177441945f744ef5e63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,8 +25,8 @@ version 0.9.4 -- unreleased
         . Removed over zealous vsnames check
         . Does not pretend anymore that duplicity can work without
           any passphrase
         . Removed over zealous vsnames check
         . Does not pretend anymore that duplicity can work without
           any passphrase

-        . More or less support duplicity >=0.4.2 (bandwidthlimit option maybe
-          does not work with this version, though; work in progress)
+        . Support duplicity 0.4.2 (with Debian patches applied; upstream's
+          0.4.3 will integrate them)

        sys:
         . Many more system checks were added, thanks to Petr Klíma
     lib changes
        sys:
         . Many more system checks were added, thanks to Petr Klíma
     lib changes

diff --git a/examples/example.dup b/examples/example.dup
index 539a7ab83efb317addc09d8d2076c1a4f785e245..b90655140c1b56626eb3f6fc2fd6ea82f11d9a66 100644 (file)
--- a/examples/example.dup
+++ b/examples/example.dup
@@ -105,7 +105,6 @@ exclude = /home/*/.gnupg
 #keep = yes
 
 # bandwith limit, in kbit/s ; default is 0, i.e. no limit
 #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
 #bandwidthlimit = 128
 
 # passed directly to ssh and scp

diff --git a/handlers/dup.helper b/handlers/dup.helper
index b366b538a9f40e4b00b4d959c082a8d2ba390cb3..a18063dbd507de83a7e6b4f242a0c673c159ee6b 100644 (file)
--- a/handlers/dup.helper
+++ b/handlers/dup.helper
@@ -398,7 +398,6 @@ incremental = $dup_incremental
 keep = $dup_keep
 
 # bandwith limit, in kbit/s ; default is 0, i.e. no limit
 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
 
 #bandwidthlimit = 128
 bandwidthlimit = $dup_bandwidth