openstack/devstack
Code Issues Proposed changes

Merge "Improve ERROR_ON_CLONE message"

Browse Source
This commit is contained in:
Jenkins 2015-09-28 21:06:08 +00:00 committed by Gerrit Code Review
commit f5255eb1c7
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
functions-common
View File

@ -492,8 +492,11 @@ function git_clone {
if echo $git_ref | egrep -q "^refs"; then if echo $git_ref | egrep -q "^refs"; then
# If our branch name is a gerrit style refs/changes/... # If our branch name is a gerrit style refs/changes/...
if [[ ! -d $git_dest ]]; then if [[ ! -d $git_dest ]]; then
[[ "$ERROR_ON_CLONE" = "True" ]] && \ if [[ "$ERROR_ON_CLONE" = "True" ]]; then
echo "The $git_dest project was not found; if this is a gate job, add"
echo "the project to the \$PROJECTS variable in the job definition."
die $LINENO "Cloning not allowed in this configuration" die $LINENO "Cloning not allowed in this configuration"
fi
git_timed clone $git_clone_flags $git_remote $git_dest git_timed clone $git_clone_flags $git_remote $git_dest
fi fi
cd $git_dest cd $git_dest
@ -501,8 +504,11 @@ function git_clone {
else else
# do a full clone only if the directory doesn't exist # do a full clone only if the directory doesn't exist
if [[ ! -d $git_dest ]]; then if [[ ! -d $git_dest ]]; then
[[ "$ERROR_ON_CLONE" = "True" ]] && \ if [[ "$ERROR_ON_CLONE" = "True" ]]; then
echo "The $git_dest project was not found; if this is a gate job, add"
echo "the project to the \$PROJECTS variable in the job definition."
die $LINENO "Cloning not allowed in this configuration" die $LINENO "Cloning not allowed in this configuration"
fi
git_timed clone $git_clone_flags $git_remote $git_dest git_timed clone $git_clone_flags $git_remote $git_dest
cd $git_dest cd $git_dest
# This checkout syntax works for both branches and tags # This checkout syntax works for both branches and tags