1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

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)
This commit is contained in:
Tianon Gravi 2014-02-27 09:43:44 -07:00
parent 01dc79b3ea
commit 2ca4e0ea60
9 changed files with 9 additions and 9 deletions

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"
)

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"
)