openstack/devstack
Code Issues Proposed changes

Merge "fix warn function"

Browse Source
This commit is contained in:
Jenkins 2015-04-28 21:31:58 +00:00 committed by Gerrit Code Review
commit 43dcab990f
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
functions-common
View File

@ -174,10 +174,7 @@ function warn {
local xtrace=$(set +o | grep xtrace)
set +o xtrace
local msg="[WARNING] ${BASH_SOURCE[2]}:$1 $2"
echo $msg 1>&2;
if [[ -n ${LOGDIR} ]]; then
echo $msg >> "${LOGDIR}/error.log"
fi
echo $msg
$xtrace
return $exitcode
}
@ -509,7 +506,7 @@ function git_timed {
fi
count=$(($count + 1))
warn "timeout ${count} for git call: [git $@]"
warn $LINENO "timeout ${count} for git call: [git $@]"
if [ $count -eq 3 ]; then
die $LINENO "Maximum of 3 git retries reached"
fi