openstack/devstack
Code Issues Proposed changes

Quote error messages

Browse Source 
As a follow-on to I28aebffce6c5561360a9e44c1abc44b709054c30; make sure
we quote the error messages on the way through so they retain their
newlines.

Change-Id: I493317948264941b4788b100a0b0bc13d2698acf
This commit is contained in:
Ian Wienand 2018-10-08 15:20:34 +11:00
parent 4e16c3dd5f
commit e8a6a0261c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
functions-common
View File

@ -228,9 +228,9 @@ function err {
xtrace=$(set +o | grep xtrace) xtrace=$(set +o | grep xtrace)
set +o xtrace set +o xtrace
local msg="[ERROR] ${BASH_SOURCE[2]}:$1 $2" local msg="[ERROR] ${BASH_SOURCE[2]}:$1 $2"
echo $msg 1>&2; echo "$msg" 1>&2;
if [[ -n ${LOGDIR} ]]; then if [[ -n ${LOGDIR} ]]; then
echo $msg >> "${LOGDIR}/error.log" echo "$msg" >> "${LOGDIR}/error.log"
fi fi
$xtrace $xtrace
return $exitcode return $exitcode
@ -283,7 +283,7 @@ function warn {
xtrace=$(set +o | grep xtrace) xtrace=$(set +o | grep xtrace)
set +o xtrace set +o xtrace
local msg="[WARNING] ${BASH_SOURCE[2]}:$1 $2" local msg="[WARNING] ${BASH_SOURCE[2]}:$1 $2"
echo $msg echo "$msg"
$xtrace $xtrace
return $exitcode return $exitcode
} }
@ -1442,11 +1442,11 @@ function _common_systemd_pitfalls {
read -r -d '' msg << EOF || true # read returns 1 for EOF, but it is ok here read -r -d '' msg << EOF || true # read returns 1 for EOF, but it is ok here
You are trying to use run_process with sudo, this is not going to work under systemd. You are trying to use run_process with sudo, this is not going to work under systemd.
If you need to run a service as a user other than $STACK_USER call it with: If you need to run a service as a user other than \$STACK_USER call it with:
run_process \$name \$cmd \$group \$user run_process \$name \$cmd \$group \$user
EOF EOF
die $LINENO $msg die $LINENO "$msg"
fi fi
if [[ ! "$cmd" =~ ^/ ]]; then if [[ ! "$cmd" =~ ^/ ]]; then
@ -1456,7 +1456,7 @@ start under systemd.
Please update your run_process stanza to have an absolute path. Please update your run_process stanza to have an absolute path.
EOF EOF
die $LINENO $msg die $LINENO "$msg"
fi fi
} }