From 5b7f2617351e615c85cc508f06e4ff0c5a49f2ba Mon Sep 17 00:00:00 2001 From: Jimmy McCrory Date: Wed, 22 Feb 2017 12:12:41 -0800 Subject: [PATCH] Fix checkout of cloned leap upgrade repos Perform a git branch checkout on cloned OSA repo directories when the ignore-changes.marker file does not exist. Change-Id: Ib062198f54e399d644e13c7aea7582e0ad6e1976 --- leap-upgrades/lib/functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/leap-upgrades/lib/functions.sh b/leap-upgrades/lib/functions.sh index e5c70432..e56edad0 100644 --- a/leap-upgrades/lib/functions.sh +++ b/leap-upgrades/lib/functions.sh @@ -224,7 +224,7 @@ function clone_release { # Enter the clone directory and checkout the given branch, If the given checkout has an # "ignore-changes.marker" file present the checkout will be skipped. pushd "/opt/leap42/openstack-ansible-$1" - if [[ -f "ignore-changes.marker" ]]; then + if [[ ! -f "ignore-changes.marker" ]]; then git clean -qfdx git fetch --all git checkout "$1"