summaryrefslogtreecommitdiff
path: root/mason
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-08-19 17:18:23 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2014-08-19 17:23:10 +0000
commit76fe5cb4178939add86d078443a03f21b7a78229 (patch)
treedeac1f08fbf6a7a85d058e7442020c3cbb6a3005 /mason
parentbe5df0f35166096af951fb6403f03e910e101d62 (diff)
downloaddefinitions-76fe5cb4178939add86d078443a03f21b7a78229.tar.gz
mason: Don't checkout repo using .git suffix
Failing to do this means that the deployment uses the wrong morphology, because build will end up using the repo without the .git suffix, so it will never update the cached version of the repo without it. The version with the .git suffix is only updated on the initial checkout, but is used by deploy, so it would pick up obsolete morphologies and not include new changes. Rubber-stamped-by: Richard Maw
Diffstat (limited to 'mason')
-rwxr-xr-xmason/mason.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/mason/mason.sh b/mason/mason.sh
index 240cc347..13b97b7e 100755
--- a/mason/mason.sh
+++ b/mason/mason.sh
@@ -13,7 +13,7 @@ cd ws
definitions_repo="$DEFINITIONS_REF"/"$DISTBUILD_TROVE_ADDRESS"/baserock/baserock/definitions
if [ ! -e "$definitions_repo" ]; then
- morph checkout git://"$DISTBUILD_TROVE_ADDRESS"/baserock/baserock/definitions.git "$DEFINITIONS_REF"
+ morph checkout git://"$DISTBUILD_TROVE_ADDRESS"/baserock/baserock/definitions "$DEFINITIONS_REF"
cd "$definitions_repo"
git config user.name "$TROVE_ID"-mason
git config user.email "$TROVE_ID"-mason@$(hostname)