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

[matthijs/upstream/backupninja.git] / handlers / dup.in

diff --git a/handlers/dup.in b/handlers/dup.in
index 59aa90a424cd24469dad2110d50e0a87a2c7f858..198eef72dcb46b8abeb00acac443601feaed49cf 100644 (file)
--- 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
 ### 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 \
    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=$?
    exit_code=$?

+   debug $output
+   cat $outputfile | (while read output ; do
+                         debug $output
+                      done
+   )

    if [ $exit_code -eq 0 ]; then
    if [ $exit_code -eq 0 ]; then

-      debug $output

       info "Duplicity finished successfully."
    else
       info "Duplicity finished successfully."
    else

-      debug $output

       fatal "Duplicity failed."
    fi
       fatal "Duplicity failed."
    fi

+   rm $outputfile

 fi
 
 return 0
 fi
 
 return 0