Finally remove our copy of "archive/tar" now that Go 1.4 is the minimum!

IT'S ABOUT TIME. 🎉

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
This commit is contained in:
Tianon Gravi 2015-05-01 16:01:10 -06:00
parent 112ff23e41
commit d05398f1e9
12 changed files with 12 additions and 22 deletions

View file

@ -1,6 +1,7 @@
package archive package archive
import ( import (
"archive/tar"
"bufio" "bufio"
"bytes" "bytes"
"compress/bzip2" "compress/bzip2"
@ -16,8 +17,6 @@ import (
"strings" "strings"
"syscall" "syscall"
"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/fileutils" "github.com/docker/docker/pkg/fileutils"
"github.com/docker/docker/pkg/pools" "github.com/docker/docker/pkg/pools"

View file

@ -1,6 +1,7 @@
package archive package archive
import ( import (
"archive/tar"
"bytes" "bytes"
"fmt" "fmt"
"io" "io"
@ -15,7 +16,6 @@ import (
"time" "time"
"github.com/docker/docker/pkg/system" "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) { func TestIsArchiveNilHeader(t *testing.T) {

View file

@ -3,11 +3,10 @@
package archive package archive
import ( import (
"archive/tar"
"errors" "errors"
"os" "os"
"syscall" "syscall"
"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
) )
// canonicalTarNameForPath returns platform-specific filepath // canonicalTarNameForPath returns platform-specific filepath

View file

@ -3,11 +3,10 @@
package archive package archive
import ( import (
"archive/tar"
"fmt" "fmt"
"os" "os"
"strings" "strings"
"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
) )
// canonicalTarNameForPath returns platform-specific filepath // canonicalTarNameForPath returns platform-specific filepath

View file

@ -1,6 +1,7 @@
package archive package archive
import ( import (
"archive/tar"
"bytes" "bytes"
"fmt" "fmt"
"io" "io"
@ -11,8 +12,6 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/pools" "github.com/docker/docker/pkg/pools"
"github.com/docker/docker/pkg/system" "github.com/docker/docker/pkg/system"

View file

@ -1,6 +1,7 @@
package archive package archive
import ( import (
"archive/tar"
"fmt" "fmt"
"io" "io"
"io/ioutil" "io/ioutil"
@ -9,8 +10,6 @@ import (
"strings" "strings"
"syscall" "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/pools"
"github.com/docker/docker/pkg/system" "github.com/docker/docker/pkg/system"
) )

View file

@ -1,9 +1,8 @@
package archive package archive
import ( import (
"archive/tar"
"testing" "testing"
"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
) )
func TestApplyLayerInvalidFilenames(t *testing.T) { func TestApplyLayerInvalidFilenames(t *testing.T) {

View file

@ -1,6 +1,7 @@
package archive package archive
import ( import (
"archive/tar"
"bytes" "bytes"
"fmt" "fmt"
"io" "io"
@ -8,8 +9,6 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"time" "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{ var testUntarFns = map[string]func(string, io.Reader) error{

View file

@ -1,8 +1,8 @@
package archive package archive
import ( import (
"archive/tar"
"bytes" "bytes"
"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
"io/ioutil" "io/ioutil"
) )

View file

@ -1,6 +1,7 @@
package tarsum package tarsum
import ( import (
"archive/tar"
"bytes" "bytes"
"compress/gzip" "compress/gzip"
"crypto" "crypto"
@ -11,8 +12,6 @@ import (
"hash" "hash"
"io" "io"
"strings" "strings"
"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
) )
const ( const (

View file

@ -1,6 +1,7 @@
package tarsum package tarsum
import ( import (
"archive/tar"
"bytes" "bytes"
"compress/gzip" "compress/gzip"
"crypto/md5" "crypto/md5"
@ -14,8 +15,6 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"testing" "testing"
"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
) )
type testLayer struct { type testLayer struct {

View file

@ -1,12 +1,11 @@
package tarsum package tarsum
import ( import (
"archive/tar"
"errors" "errors"
"sort" "sort"
"strconv" "strconv"
"strings" "strings"
"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
) )
// versioning of the TarSum algorithm // versioning of the TarSum algorithm