X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fbackupninja.git;a=blobdiff_plain;f=handlers%2Fdup.in;h=198eef72dcb46b8abeb00acac443601feaed49cf;hp=54b77097ed5899f5530d0990dbdc1c21f0dbd31d;hb=61eb6a74843ba000b4de58d3271c5cb545c891d0;hpb=f45803230a839de092122f6843422097deff4eaa

diff --git a/handlers/dup.in b/handlers/dup.in
index 54b7709..198eef7 100644
--- a/handlers/dup.in
+++ b/handlers/dup.in
@@ -107,7 +107,7 @@ duplicity_sub="`echo $duplicity_version | @AWK@ -F '.' '{print $3}'`"
 
 scpoptions="$sshoptions"
 if [ "$bandwidthlimit" != 0 ]; then
-   [ -z "$testurl" ] || warning 'The bandwidthlimit option is not used when desturl is set.'
+   [ -z "$desturl" ] || warning 'The bandwidthlimit option is not used when desturl is set.'
    scpoptions="$scpoptions -l $bandwidthlimit"
 fi
 
@@ -263,18 +263,23 @@ fi
 ### Backup command
 debug "$precmd duplicity $execstr_command $execstr_options $execstr_source --exclude '**' / $execstr_serverpart"
 if [ ! $test ]; then
+   outputfile=`maketemp backupout`
    export PASSPHRASE=$password
    output=`nice -n $nicelevel \
              su -c \
-                "$precmd duplicity $execstr_command $execstr_options $execstr_source --exclude '**' / $execstr_serverpart 2>&1"`
+                "$precmd duplicity $execstr_command $execstr_options $execstr_source --exclude '**' / $execstr_serverpart >$outputfile 2>&1"`
    exit_code=$?
+   debug $output
+   cat $outputfile | (while read output ; do
+                         debug $output
+                      done
+   )
    if [ $exit_code -eq 0 ]; then
-      debug $output
       info "Duplicity finished successfully."
    else
-      debug $output
       fatal "Duplicity failed."
    fi
+   rm $outputfile
 fi
 
 return 0