From 2a3dcabe7040255a2d7118d2644a25821db4cd25 Mon Sep 17 00:00:00 2001 From: "Crank, Daniel (dc6350)" Date: Wed, 1 Aug 2018 11:26:49 -0500 Subject: [PATCH] Correct local git repo directories Correct the local target directories for pegleg and shipyard so they will be properly skipped if they already exist rather than causing a (benign) git error. Change-Id: I4dc9dd5e3bf5e38ebeb8f6b90e90aaf3ec46737e --- manifests/common/deploy-airship.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/common/deploy-airship.sh b/manifests/common/deploy-airship.sh index 911dd6db..1d7d5708 100755 --- a/manifests/common/deploy-airship.sh +++ b/manifests/common/deploy-airship.sh @@ -175,11 +175,11 @@ function get_repo() { function setup_repos() { # Clone and pull the various git repos # Get pegleg for the script only. Image is separately referenced. - get_repo pegleg ${PEGLEG_REPO} ${PEGLEG_REFSPEC} + get_repo airship-pegleg ${PEGLEG_REPO} ${PEGLEG_REFSPEC} # Get airship-in-a-bottle for the design get_repo airship-in-a-bottle ${AIRSHIP_IN_A_BOTTLE_REPO} ${AIRSHIP_IN_A_BOTTLE_REFSPEC} # Get Shipyard for use after genesis - get_repo shipyard ${SHIPYARD_REPO} ${SHIPYARD_REFSPEC} + get_repo airship-shipyard ${SHIPYARD_REPO} ${SHIPYARD_REFSPEC} } function configure_dev_configurables() {