From d05398f1e92b2987789a3cee937b107d45918a25 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 1 May 2015 16:01:10 -0600 Subject: [PATCH] Finally remove our copy of "archive/tar" now that Go 1.4 is the minimum! IT'S ABOUT TIME. :tada: Signed-off-by: Andrew "Tianon" Page --- archive/archive.go | 3 +-- archive/archive_test.go | 2 +- archive/archive_unix.go | 3 +-- archive/archive_windows.go | 3 +-- archive/changes.go | 3 +-- archive/diff.go | 3 +-- archive/diff_test.go | 3 +-- archive/utils_test.go | 3 +-- archive/wrap.go | 2 +- tarsum/tarsum.go | 3 +-- tarsum/tarsum_test.go | 3 +-- tarsum/versioning.go | 3 +-- 12 files changed, 12 insertions(+), 22 deletions(-) diff --git a/archive/archive.go b/archive/archive.go index 4d8d260..1579df1 100644 --- a/archive/archive.go +++ b/archive/archive.go @@ -1,6 +1,7 @@ package archive import ( + "archive/tar" "bufio" "bytes" "compress/bzip2" @@ -16,8 +17,6 @@ import ( "strings" "syscall" - "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" - "github.com/Sirupsen/logrus" "github.com/docker/docker/pkg/fileutils" "github.com/docker/docker/pkg/pools" diff --git a/archive/archive_test.go b/archive/archive_test.go index ae9b5a8..f24f628 100644 --- a/archive/archive_test.go +++ b/archive/archive_test.go @@ -1,6 +1,7 @@ package archive import ( + "archive/tar" "bytes" "fmt" "io" @@ -15,7 +16,6 @@ import ( "time" "github.com/docker/docker/pkg/system" - "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ) func TestIsArchiveNilHeader(t *testing.T) { diff --git a/archive/archive_unix.go b/archive/archive_unix.go index 82c9a82..6dc96a4 100644 --- a/archive/archive_unix.go +++ b/archive/archive_unix.go @@ -3,11 +3,10 @@ package archive import ( + "archive/tar" "errors" "os" "syscall" - - "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ) // canonicalTarNameForPath returns platform-specific filepath diff --git a/archive/archive_windows.go b/archive/archive_windows.go index 6caef3b..593346d 100644 --- a/archive/archive_windows.go +++ b/archive/archive_windows.go @@ -3,11 +3,10 @@ package archive import ( + "archive/tar" "fmt" "os" "strings" - - "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ) // canonicalTarNameForPath returns platform-specific filepath diff --git a/archive/changes.go b/archive/changes.go index 06fad8e..d03af0f 100644 --- a/archive/changes.go +++ b/archive/changes.go @@ -1,6 +1,7 @@ package archive import ( + "archive/tar" "bytes" "fmt" "io" @@ -11,8 +12,6 @@ import ( "syscall" "time" - "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" - "github.com/Sirupsen/logrus" "github.com/docker/docker/pkg/pools" "github.com/docker/docker/pkg/system" diff --git a/archive/diff.go b/archive/diff.go index b5eb63f..a8314bc 100644 --- a/archive/diff.go +++ b/archive/diff.go @@ -1,6 +1,7 @@ package archive import ( + "archive/tar" "fmt" "io" "io/ioutil" @@ -9,8 +10,6 @@ import ( "strings" "syscall" - "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" - "github.com/docker/docker/pkg/pools" "github.com/docker/docker/pkg/system" ) diff --git a/archive/diff_test.go b/archive/diff_test.go index 758c411..01ed437 100644 --- a/archive/diff_test.go +++ b/archive/diff_test.go @@ -1,9 +1,8 @@ package archive import ( + "archive/tar" "testing" - - "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ) func TestApplyLayerInvalidFilenames(t *testing.T) { diff --git a/archive/utils_test.go b/archive/utils_test.go index 9048027..2a266c2 100644 --- a/archive/utils_test.go +++ b/archive/utils_test.go @@ -1,6 +1,7 @@ package archive import ( + "archive/tar" "bytes" "fmt" "io" @@ -8,8 +9,6 @@ import ( "os" "path/filepath" "time" - - "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ) var testUntarFns = map[string]func(string, io.Reader) error{ diff --git a/archive/wrap.go b/archive/wrap.go index b8b6019..dfb335c 100644 --- a/archive/wrap.go +++ b/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/tarsum/tarsum.go b/tarsum/tarsum.go index 88fcbe4..a778bb0 100644 --- a/tarsum/tarsum.go +++ b/tarsum/tarsum.go @@ -1,6 +1,7 @@ package tarsum import ( + "archive/tar" "bytes" "compress/gzip" "crypto" @@ -11,8 +12,6 @@ import ( "hash" "io" "strings" - - "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ) const ( diff --git a/tarsum/tarsum_test.go b/tarsum/tarsum_test.go index 26f12cc..968d7c7 100644 --- a/tarsum/tarsum_test.go +++ b/tarsum/tarsum_test.go @@ -1,6 +1,7 @@ package tarsum import ( + "archive/tar" "bytes" "compress/gzip" "crypto/md5" @@ -14,8 +15,6 @@ import ( "io/ioutil" "os" "testing" - - "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ) type testLayer struct { diff --git a/tarsum/versioning.go b/tarsum/versioning.go index 0ceb529..3cdc6dd 100644 --- a/tarsum/versioning.go +++ b/tarsum/versioning.go @@ -1,12 +1,11 @@ package tarsum import ( + "archive/tar" "errors" "sort" "strconv" "strings" - - "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ) // versioning of the TarSum algorithm