bundles/backup-client: fix newlines
All checks were successful
kunsi/bundlewrap/pipeline/head This commit looks good
All checks were successful
kunsi/bundlewrap/pipeline/head This commit looks good
This commit is contained in:
parent
55d481b86c
commit
0f425036b2
2 changed files with 7 additions and 2 deletions
|
@ -37,5 +37,6 @@ elif exitcode == 'abort_no_key':
|
||||||
exit(1)
|
exit(1)
|
||||||
else:
|
else:
|
||||||
# garbage in file
|
# garbage in file
|
||||||
print(' '.join(status))
|
for line in status:
|
||||||
|
print(line)
|
||||||
exit(3)
|
exit(3)
|
||||||
|
|
|
@ -3,6 +3,8 @@
|
||||||
statusfile=/var/tmp/backup.monitoring
|
statusfile=/var/tmp/backup.monitoring
|
||||||
ssh_login="${username}@${server}"
|
ssh_login="${username}@${server}"
|
||||||
|
|
||||||
|
NL=$'\n'
|
||||||
|
|
||||||
if ! [[ -f /etc/backup.priv ]]
|
if ! [[ -f /etc/backup.priv ]]
|
||||||
then
|
then
|
||||||
echo "abort_no_key" > "$statusfile"
|
echo "abort_no_key" > "$statusfile"
|
||||||
|
@ -29,7 +31,9 @@ do_backup() {
|
||||||
exitcode=$?
|
exitcode=$?
|
||||||
if [[ $exitcode != 0 ]] && [[ $exitcode != 24 ]]
|
if [[ $exitcode != 0 ]] && [[ $exitcode != 24 ]]
|
||||||
then
|
then
|
||||||
rsync_errors+="\n$1 $exitcode"
|
<%text>
|
||||||
|
rsync_errors+="${NL}${1} ${exitcode}"
|
||||||
|
</%text>
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue