[sonic-frr]: Checkout gracefully if branch exists already. (#8289)

If branch exist already, today FRR build fails. Branch may exist on rebuild. With this PR, we will Checkout branch gracefully if branch exists already. Signed-off-by: Praveen Chaudhary<[email protected]>
sonic-net · Aug 15, 2021 · 144a7bc · 144a7bc
1 parent 76ed66c
commit 144a7bc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/sonic-frr/Makefile b/src/sonic-frr/Makefile
@@ -10,7 +10,7 @@ STG_BRANCH = stg_temp.$(SUFFIX)
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	# Build the package
 	pushd ./frr
-	git checkout -b $(FRR_BRANCH) origin/$(FRR_BRANCH)
+	git checkout -b $(FRR_BRANCH) origin/$(FRR_BRANCH) || git checkout $(FRR_BRANCH)
 	stg branch --create $(STG_BRANCH) $(FRR_TAG)
 	stg import -s ../patch/series
 	tools/tarsource.sh -V -e '-sonic'