From 2ca4e0ea60851ff8e9c0a05dc13fa23436c529b6 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 27 Feb 2014 09:43:44 -0700 Subject: [PATCH] Use a more defensive vendored archive/tar import path to make it clear this isn't upstream's released archive/tar Docker-DCO-1.1-Signed-off-by: Andrew Page (github: tianon) --- archive/archive.go | 2 +- archive/archive_test.go | 2 +- archive/changes.go | 2 +- archive/diff.go | 2 +- archive/wrap.go | 2 +- integration/api_test.go | 2 +- integration/utils_test.go | 2 +- utils/tarsum.go | 2 +- utils_test.go | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/archive/archive.go b/archive/archive.go index 8bb0a8ed1c..72bd31a281 100644 --- a/archive/archive.go +++ b/archive/archive.go @@ -2,12 +2,12 @@ package archive import ( "bytes" - "code.google.com/p/go/src/pkg/archive/tar" "compress/bzip2" "compress/gzip" "errors" "fmt" "github.com/dotcloud/docker/utils" + "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" "io" "io/ioutil" "os" diff --git a/archive/archive_test.go b/archive/archive_test.go index 8badd58bd7..412660139c 100644 --- a/archive/archive_test.go +++ b/archive/archive_test.go @@ -2,8 +2,8 @@ package archive import ( "bytes" - "code.google.com/p/go/src/pkg/archive/tar" "fmt" + "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" "io" "io/ioutil" "os" diff --git a/archive/changes.go b/archive/changes.go index a9eba8196f..a397a1cf8b 100644 --- a/archive/changes.go +++ b/archive/changes.go @@ -2,9 +2,9 @@ package archive import ( "bytes" - "code.google.com/p/go/src/pkg/archive/tar" "fmt" "github.com/dotcloud/docker/utils" + "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" "io" "os" "path/filepath" diff --git a/archive/diff.go b/archive/diff.go index 6a778390bb..e20e4b1f02 100644 --- a/archive/diff.go +++ b/archive/diff.go @@ -1,8 +1,8 @@ package archive import ( - "code.google.com/p/go/src/pkg/archive/tar" "fmt" + "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" "io" "io/ioutil" "os" diff --git a/archive/wrap.go b/archive/wrap.go index 981420b3fe..03ea5083ac 100644 --- a/archive/wrap.go +++ b/archive/wrap.go @@ -2,7 +2,7 @@ package archive import ( "bytes" - "code.google.com/p/go/src/pkg/archive/tar" + "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" "io/ioutil" ) diff --git a/integration/api_test.go b/integration/api_test.go index 4c22d54b3d..cb92d89858 100644 --- a/integration/api_test.go +++ b/integration/api_test.go @@ -3,7 +3,6 @@ package docker import ( "bufio" "bytes" - "code.google.com/p/go/src/pkg/archive/tar" "encoding/json" "fmt" "github.com/dotcloud/docker" @@ -12,6 +11,7 @@ import ( "github.com/dotcloud/docker/engine" "github.com/dotcloud/docker/runconfig" "github.com/dotcloud/docker/utils" + "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" "io" "io/ioutil" "net" diff --git a/integration/utils_test.go b/integration/utils_test.go index fc66e8bcbd..50a4c9bf25 100644 --- a/integration/utils_test.go +++ b/integration/utils_test.go @@ -2,8 +2,8 @@ package docker import ( "bytes" - "code.google.com/p/go/src/pkg/archive/tar" "fmt" + "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" "io" "io/ioutil" "net/http" diff --git a/utils/tarsum.go b/utils/tarsum.go index ddeecfb450..67e94aaebc 100644 --- a/utils/tarsum.go +++ b/utils/tarsum.go @@ -2,10 +2,10 @@ package utils import ( "bytes" - "code.google.com/p/go/src/pkg/archive/tar" "compress/gzip" "crypto/sha256" "encoding/hex" + "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" "hash" "io" "sort" diff --git a/utils_test.go b/utils_test.go index 6917007575..31fa12b6ad 100644 --- a/utils_test.go +++ b/utils_test.go @@ -2,7 +2,7 @@ package docker import ( "bytes" - "code.google.com/p/go/src/pkg/archive/tar" + "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" "io" )