From b3bee7e0c43dd281c081cd59d7403148d3f8af88 Mon Sep 17 00:00:00 2001 From: Johan Euphrosine Date: Wed, 20 Nov 2013 18:45:12 +0000 Subject: [PATCH] utils: remove dotcloud/tar dep --- .../infrastructure/docker-ci/docker-coverage/coverage-docker.sh | 2 +- hack/vendor.sh | 2 -- utils/tarsum.go | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hack/infrastructure/docker-ci/docker-coverage/coverage-docker.sh b/hack/infrastructure/docker-ci/docker-coverage/coverage-docker.sh index 2ca3b6e801..f03243cf8f 100755 --- a/hack/infrastructure/docker-ci/docker-coverage/coverage-docker.sh +++ b/hack/infrastructure/docker-ci/docker-coverage/coverage-docker.sh @@ -23,7 +23,7 @@ cd $BASE_PATH/go GOPATH=$BASE_PATH/go go get github.com/axw/gocov/gocov sudo -E GOPATH=$GOPATH ./bin/gocov test -deps -exclude-goroot -v\ -exclude github.com/gorilla/context,github.com/gorilla/mux,github.com/kr/pty,\ -code.google.com/p/go.net/websocket,github.com/dotcloud/tar\ +code.google.com/p/go.net/websocket\ github.com/dotcloud/docker | ./bin/gocov report; exit_status=$? # Cleanup testing directory diff --git a/hack/vendor.sh b/hack/vendor.sh index a2411c8005..93dd8739ce 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -27,8 +27,6 @@ git_clone github.com/gorilla/context/ 708054d61e5 git_clone github.com/gorilla/mux/ 9b36453141c -git_clone github.com/dotcloud/tar/ e5ea6bb21a - # Docker requires code.google.com/p/go.net/websocket PKG=code.google.com/p/go.net REV=84a4013f96e0 ( diff --git a/utils/tarsum.go b/utils/tarsum.go index 290be241a9..9cba516a34 100644 --- a/utils/tarsum.go +++ b/utils/tarsum.go @@ -5,7 +5,7 @@ import ( "compress/gzip" "crypto/sha256" "encoding/hex" - "github.com/dotcloud/tar" + "archive/tar" "hash" "io" "sort"