From 37adf6c38c3a6f7c2f615a106c27da2173853581 Mon Sep 17 00:00:00 2001 From: Paul Tagliamonte Date: Sat, 3 Jan 2015 07:11:47 +0000 Subject: [PATCH] upstream-patched-archive-tar Gbp-Pq: Name upstream-patched-archive-tar.patch --- graph/tags_unit_test.go | 2 +- integration-cli/utils.go | 2 +- integration/api_test.go | 2 +- integration/utils_test.go | 2 +- pkg/archive/archive.go | 2 +- pkg/archive/archive_test.go | 2 +- pkg/archive/changes.go | 2 +- pkg/archive/diff.go | 2 +- pkg/archive/diff_test.go | 2 +- pkg/archive/utils_test.go | 2 +- pkg/archive/wrap.go | 2 +- pkg/tarsum/tarsum.go | 2 +- pkg/tarsum/tarsum_test.go | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/graph/tags_unit_test.go b/graph/tags_unit_test.go index bf94deb4..35ad6fd0 100644 --- a/graph/tags_unit_test.go +++ b/graph/tags_unit_test.go @@ -7,11 +7,11 @@ import ( "path" "testing" + "archive/tar" "github.com/docker/docker/daemon/graphdriver" _ "github.com/docker/docker/daemon/graphdriver/vfs" // import the vfs driver so it is used in the tests "github.com/docker/docker/image" "github.com/docker/docker/utils" - "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ) const ( diff --git a/integration-cli/utils.go b/integration-cli/utils.go index f3f128e3..abea8a3a 100644 --- a/integration-cli/utils.go +++ b/integration-cli/utils.go @@ -16,7 +16,7 @@ import ( "testing" "time" - "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" + "archive/tar" ) func getExitCode(err error) (int, error) { diff --git a/integration/api_test.go b/integration/api_test.go index 8fa295e7..9c1ecb29 100644 --- a/integration/api_test.go +++ b/integration/api_test.go @@ -14,11 +14,11 @@ import ( "testing" "time" + "archive/tar" "github.com/docker/docker/api" "github.com/docker/docker/api/server" "github.com/docker/docker/engine" "github.com/docker/docker/runconfig" - "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ) func TestGetContainersJSON(t *testing.T) { diff --git a/integration/utils_test.go b/integration/utils_test.go index e1abfa72..c5bc3af6 100644 --- a/integration/utils_test.go +++ b/integration/utils_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" + "archive/tar" "github.com/docker/docker/builtins" "github.com/docker/docker/daemon" diff --git a/pkg/archive/archive.go b/pkg/archive/archive.go index 74c60145..0163d4cb 100644 --- a/pkg/archive/archive.go +++ b/pkg/archive/archive.go @@ -16,7 +16,7 @@ import ( "strings" "syscall" - "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" + "archive/tar" "github.com/docker/docker/pkg/fileutils" "github.com/docker/docker/pkg/log" diff --git a/pkg/archive/archive_test.go b/pkg/archive/archive_test.go index 7c9db444..39c8caf7 100644 --- a/pkg/archive/archive_test.go +++ b/pkg/archive/archive_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" + "archive/tar" ) func TestCmdStreamLargeStderr(t *testing.T) { diff --git a/pkg/archive/changes.go b/pkg/archive/changes.go index 5fbdcc90..fa96bb8a 100644 --- a/pkg/archive/changes.go +++ b/pkg/archive/changes.go @@ -10,7 +10,7 @@ import ( "syscall" "time" - "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" + "archive/tar" "github.com/docker/docker/pkg/log" "github.com/docker/docker/pkg/pools" diff --git a/pkg/archive/diff.go b/pkg/archive/diff.go index 80bb1974..cd7de4de 100644 --- a/pkg/archive/diff.go +++ b/pkg/archive/diff.go @@ -9,7 +9,7 @@ import ( "strings" "syscall" - "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" + "archive/tar" "github.com/docker/docker/pkg/pools" ) diff --git a/pkg/archive/diff_test.go b/pkg/archive/diff_test.go index 758c4115..1af10fe6 100644 --- a/pkg/archive/diff_test.go +++ b/pkg/archive/diff_test.go @@ -3,7 +3,7 @@ package archive import ( "testing" - "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" + "archive/tar" ) func TestApplyLayerInvalidFilenames(t *testing.T) { diff --git a/pkg/archive/utils_test.go b/pkg/archive/utils_test.go index 3624fe5a..8e26a112 100644 --- a/pkg/archive/utils_test.go +++ b/pkg/archive/utils_test.go @@ -9,7 +9,7 @@ import ( "path/filepath" "time" - "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" + "archive/tar" ) var testUntarFns = map[string]func(string, io.Reader) error{ diff --git a/pkg/archive/wrap.go b/pkg/archive/wrap.go index b8b60197..dfb335c0 100644 --- a/pkg/archive/wrap.go +++ b/pkg/archive/wrap.go @@ -1,8 +1,8 @@ package archive import ( + "archive/tar" "bytes" - "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" "io/ioutil" ) diff --git a/pkg/tarsum/tarsum.go b/pkg/tarsum/tarsum.go index 6581f3f2..ed364940 100644 --- a/pkg/tarsum/tarsum.go +++ b/pkg/tarsum/tarsum.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" + "archive/tar" "github.com/docker/docker/pkg/log" ) diff --git a/pkg/tarsum/tarsum_test.go b/pkg/tarsum/tarsum_test.go index 1e06cda1..ef910c32 100644 --- a/pkg/tarsum/tarsum_test.go +++ b/pkg/tarsum/tarsum_test.go @@ -15,7 +15,7 @@ import ( "os" "testing" - "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" + "archive/tar" ) type testLayer struct { -- 2.30.2