Skip to content
Snippets Groups Projects
Commit 61eb6a74 authored by olivier's avatar olivier Committed by intrigeri
Browse files

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

parent a53e8a53
Branches
Tags
No related merge requests found
...@@ -263,18 +263,23 @@ fi ...@@ -263,18 +263,23 @@ fi
### Backup command ### Backup command
debug "$precmd duplicity $execstr_command $execstr_options $execstr_source --exclude '**' / $execstr_serverpart" debug "$precmd duplicity $execstr_command $execstr_options $execstr_source --exclude '**' / $execstr_serverpart"
if [ ! $test ]; then if [ ! $test ]; then
outputfile=`maketemp backupout`
export PASSPHRASE=$password export PASSPHRASE=$password
output=`nice -n $nicelevel \ output=`nice -n $nicelevel \
su -c \ 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=$?
if [ $exit_code -eq 0 ]; then
debug $output debug $output
cat $outputfile | (while read output ; do
debug $output
done
)
if [ $exit_code -eq 0 ]; then
info "Duplicity finished successfully." info "Duplicity finished successfully."
else else
debug $output
fatal "Duplicity failed." fatal "Duplicity failed."
fi fi
rm $outputfile
fi fi
return 0 return 0
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment