openstack/devstack
Code Issues Proposed changes

exit cleanup in functions

Browse Source 
we should always use die instead of exit so that we know why we
failed.

Also remove instances where exit is called after die, as that is
a noop.

Change-Id: I8e08cce63d35c503c36ff1e09805f3db427d082d
This commit is contained in:
Sean Dague 2013-10-22 07:30:47 -04:00
parent ff38d464e4
commit dc30bd3eb4
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
functions
View File

@ -580,7 +580,8 @@ function git_clone {
if echo $GIT_REF | egrep -q "^refs"; then
# If our branch name is a gerrit style refs/changes/...
if [[ ! -d $GIT_DEST ]]; then
[[ "$ERROR_ON_CLONE" = "True" ]] && exit 1
[[ "$ERROR_ON_CLONE" = "True" ]] && \
die $LINENO "Cloning not allowed in this configuration"
git clone $GIT_REMOTE $GIT_DEST
fi
cd $GIT_DEST
@ -588,7 +589,8 @@ function git_clone {
else
# do a full clone only if the directory doesn't exist
if [[ ! -d $GIT_DEST ]]; then
[[ "$ERROR_ON_CLONE" = "True" ]] && exit 1
[[ "$ERROR_ON_CLONE" = "True" ]] && \
die $LINENO "Cloning not allowed in this configuration"
git clone $GIT_REMOTE $GIT_DEST
cd $GIT_DEST
# This checkout syntax works for both branches and tags
@ -612,8 +614,7 @@ function git_clone {
elif [[ -n "`git show-ref refs/remotes/origin/$GIT_REF`" ]]; then
git_update_remote_branch $GIT_REF
else
echo $GIT_REF is neither branch nor tag
exit 1
die $LINENO "$GIT_REF is neither branch nor tag"
fi
fi
@ -1562,7 +1563,6 @@ function _ping_check_novanet() {
else
die $LINENO "[Fail] Could ping server"
fi
exit 1
fi
}
@ -1575,7 +1575,6 @@ function get_instance_ip(){
if [[ $ip = "" ]];then
echo "$nova_result"
die $LINENO "[Fail] Coudn't get ipaddress of VM"
exit 1
fi
echo $ip
}