From 78c68825671eb1bd102d76d671ace9de5a37aa19 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 20 Aug 2014 14:17:11 -0600 Subject: [PATCH] Optionalize the "hg clone" of Go, since it takes forever (now, to update our Go version too, we need to explicitly "./hack/vendor.sh --go") Signed-off-by: Andrew Page --- hack/vendor.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/hack/vendor.sh b/hack/vendor.sh index 7af22ea64e..b175918a3b 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -53,11 +53,14 @@ clone hg code.google.com/p/gosqlite 74691fb6f837 # get Go tip's archive/tar, for xattr support and improved performance # TODO after Go 1.4 drops, bump our minimum supported version and drop this vendored dep -clone hg code.google.com/p/go 1b17b3426e3c -mv src/code.google.com/p/go/src/pkg/archive/tar tmp-tar -rm -rf src/code.google.com/p/go -mkdir -p src/code.google.com/p/go/src/pkg/archive -mv tmp-tar src/code.google.com/p/go/src/pkg/archive/tar +if [ "$1" = '--go' ]; then + # Go takes forever and a half to clone, so we only redownload it when explicitly requested via the "--go" flag to this script. + clone hg code.google.com/p/go 1b17b3426e3c + mv src/code.google.com/p/go/src/pkg/archive/tar tmp-tar + rm -rf src/code.google.com/p/go + mkdir -p src/code.google.com/p/go/src/pkg/archive + mv tmp-tar src/code.google.com/p/go/src/pkg/archive/tar +fi clone git github.com/docker/libcontainer db65c35051d05f3fb218a0e84a11267e0894fe0a # see src/github.com/docker/libcontainer/update-vendor.sh which is the "source of truth" for libcontainer deps (just like this file)