1. docker
  2. Commit 2ca4e0ea60851ff8e9c0a05dc13fa23436c529b6
Browse code

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 <admwiggin@gmail.com> (github: tianon)

Tianon Gravi authored on 2014/02/28 01:43:44
Showing 9 changed files
archive/archive.go
History View file @ 2ca4e0e
... ... 
@@ -2,12 +2,12 @@ package archive
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
-	"code.google.com/p/go/src/pkg/archive/tar"
6 5 
 	"compress/bzip2"
7 6 
 	"compress/gzip"
8 7 
 	"errors"
9 8 
 	"fmt"
10 9 
 	"github.com/dotcloud/docker/utils"
10 
+	"github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
11 11 
 	"io"
12 12 
 	"io/ioutil"
13 13 
 	"os"
archive/archive_test.go
History View file @ 2ca4e0e
... ... 
@@ -2,8 +2,8 @@ package archive
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
-	"code.google.com/p/go/src/pkg/archive/tar"
6 5 
 	"fmt"
6 
+	"github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
7 7 
 	"io"
8 8 
 	"io/ioutil"
9 9 
 	"os"
archive/changes.go
History View file @ 2ca4e0e
... ... 
@@ -2,9 +2,9 @@ package archive
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
-	"code.google.com/p/go/src/pkg/archive/tar"
6 5 
 	"fmt"
7 6 
 	"github.com/dotcloud/docker/utils"
7 
+	"github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
8 8 
 	"io"
9 9 
 	"os"
10 10 
 	"path/filepath"
archive/diff.go
History View file @ 2ca4e0e
... ... 
@@ -1,8 +1,8 @@
1 1 
 package archive
2 2
3 3 
 import (
4 
-	"code.google.com/p/go/src/pkg/archive/tar"
5 4 
 	"fmt"
5 
+	"github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
6 6 
 	"io"
7 7 
 	"io/ioutil"
8 8 
 	"os"
archive/wrap.go
History View file @ 2ca4e0e
... ... 
@@ -2,7 +2,7 @@ package archive
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
-	"code.google.com/p/go/src/pkg/archive/tar"
5 
+	"github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
6 6 
 	"io/ioutil"
7 7 
 )
8 8
integration/api_test.go
History View file @ 2ca4e0e
... ... 
@@ -3,7 +3,6 @@ package docker
3 3 
 import (
4 4 
 	"bufio"
5 5 
 	"bytes"
6 
-	"code.google.com/p/go/src/pkg/archive/tar"
7 6 
 	"encoding/json"
8 7 
 	"fmt"
9 8 
 	"github.com/dotcloud/docker"
... ... 
@@ -12,6 +11,7 @@ import (
12 12 
 	"github.com/dotcloud/docker/engine"
13 13 
 	"github.com/dotcloud/docker/runconfig"
14 14 
 	"github.com/dotcloud/docker/utils"
15 
+	"github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
15 16 
 	"io"
16 17 
 	"io/ioutil"
17 18 
 	"net"
integration/utils_test.go
History View file @ 2ca4e0e
... ... 
@@ -2,8 +2,8 @@ package docker
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
-	"code.google.com/p/go/src/pkg/archive/tar"
6 5 
 	"fmt"
6 
+	"github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
7 7 
 	"io"
8 8 
 	"io/ioutil"
9 9 
 	"net/http"
utils/tarsum.go
History View file @ 2ca4e0e
... ... 
@@ -2,10 +2,10 @@ package utils
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
-	"code.google.com/p/go/src/pkg/archive/tar"
6 5 
 	"compress/gzip"
7 6 
 	"crypto/sha256"
8 7 
 	"encoding/hex"
8 
+	"github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
9 9 
 	"hash"
10 10 
 	"io"
11 11 
 	"sort"
utils_test.go
History View file @ 2ca4e0e
... ... 
@@ -2,7 +2,7 @@ package docker
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
-	"code.google.com/p/go/src/pkg/archive/tar"
5 
+	"github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
6 6 
 	"io"
7 7 
 )
8 8