aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorolivier <olivier@olivierberger.com>2010-01-05 06:44:36 +0100
committerintrigeri <intrigeri@boum.org>2010-01-05 13:16:09 +0100
commit61eb6a74843ba000b4de58d3271c5cb545c891d0 (patch)
treeb55272c807a18f7e4d33b928474ac5ebc34ea81e
parenta53e8a531a78465d449751864b19a13d4f993797 (diff)
downloadbackupninja-61eb6a74843ba000b4de58d3271c5cb545c891d0.tar.gz
backupninja-61eb6a74843ba000b4de58d3271c5cb545c891d0.tar.bz2
Add duplicity output line by line instead of with a whole at one time. Should help fix #536360
-rw-r--r--handlers/dup.in11
1 files changed, 8 insertions, 3 deletions
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