upstream-patched-archive-tar

Gbp-Pq: Name upstream-patched-archive-tar.patch

diff --git a/graph/tags_unit_test.go b/graph/tags_unit_test.go
index bf94deb44515843168e34bc1692e96e654709f5d..35ad6fd091c27a9c9b7603c68b95e5f4475518b6 100644 (file)
--- 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 f3f128e329b7512f48ab86a5c2d9dc82f8dccb21..abea8a3a833a8055b84a4cbd7d6547ca6a5d85f5 100644 (file)
--- 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 8fa295e7b142ef763478fe716e195ee2f149d630..9c1ecb296e5278c3c30badc6741a62d09d587dab 100644 (file)
--- 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 e1abfa72fc5ebe54cbb5b8b29a1e21ff0b460f87..c5bc3af69af5608e5d3410fb37609d2efd86be04 100644 (file)
--- 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 74c60145068daa717a08aa044de5b6217de5ca05..0163d4cbdead183e8cf2bf1bfe1acada3d6b22c2 100644 (file)
--- 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 7c9db444340ca68278e01ffb4b88dc01ac1379c5..39c8caf7ed93b52bd372e25f247f4e18be44acc9 100644 (file)
--- 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 5fbdcc90afe12a6d967ec101ce3ab1e8ff1a5e4b..fa96bb8a5cf94c90345ccd082fcc1c8f270f00a5 100644 (file)
--- 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 80bb197468978cdaeea524fc8e39de315ae00a2c..cd7de4de4e86857f35d25f96dfa79810f92df083 100644 (file)
--- 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 758c4115d5732287246cb6d1b9c207a2cb782e16..1af10fe6a35a9cd7a90513bf84b6aa8b56a809b5 100644 (file)
--- 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 3624fe5afa8b1f68a0fcb835d3662d85c28fc5cb..8e26a11253d5b25836d699cb90aa1e1df219697b 100644 (file)
--- 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 b8b60197a3d834ce19839be28e4ff1a7155b85ad..dfb335c0b6c047a6ae4ab50c69508cd518f64c71 100644 (file)
--- 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 6581f3f234fc0d33c41728ce06d890ba8978b9b1..ed36494055c4775c9a3aa3dc71b850b5797cf5cd 100644 (file)
--- 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 1e06cda17836e24fde30363a392a29c9cb722f3d..ef910c323ee507fa5ac81eda06942bcf1ec83c38 100644 (file)
--- 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 {