From: olivier <olivier@olivierberger.com>
Date: Tue, 5 Jan 2010 05:44:36 +0000 (+0100)
Subject: Add duplicity output line by line instead of with a whole at one time. Should help... 
X-Git-Tag: backupninja-0.9.7~17
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=61eb6a74843ba000b4de58d3271c5cb545c891d0;p=matthijs%2Fupstream%2Fbackupninja.git

Add duplicity output line by line instead of with a whole at one time. Should help fix #536360
---

diff --git a/handlers/dup.in b/handlers/dup.in
index 59aa90a..198eef7 100644
--- a/handlers/dup.in
+++ b/handlers/dup.in
@@ -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