From 6ef3b9dafaf15a789aa39ac63edfaad0278a57a6 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 17 Dec 2018 12:29:08 +0100 Subject: [PATCH] layers: use the package name pgzip instead of gzip based on some comments got on the related PR for containers/image. Signed-off-by: Giuseppe Scrivano --- layers.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/layers.go b/layers.go index 01f0dc53e..299d2f818 100644 --- a/layers.go +++ b/layers.go @@ -19,7 +19,7 @@ import ( "github.com/containers/storage/pkg/stringid" "github.com/containers/storage/pkg/system" "github.com/containers/storage/pkg/truncindex" - gzip "github.com/klauspost/pgzip" + "github.com/klauspost/pgzip" digest "github.com/opencontainers/go-digest" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" @@ -1055,7 +1055,7 @@ func (r *layerStore) Diff(from, to string, options *DiffOptions) (io.ReadCloser, } defer tsfile.Close() - decompressor, err := gzip.NewReader(tsfile) + decompressor, err := pgzip.NewReader(tsfile) if err != nil { return nil, err } @@ -1116,9 +1116,9 @@ func (r *layerStore) ApplyDiff(to string, diff io.Reader) (size int64, err error defragmented := io.TeeReader(io.MultiReader(bytes.NewBuffer(header[:n]), diff), compressedCounter) tsdata := bytes.Buffer{} - compressor, err := gzip.NewWriterLevel(&tsdata, gzip.BestSpeed) + compressor, err := pgzip.NewWriterLevel(&tsdata, pgzip.BestSpeed) if err != nil { - compressor = gzip.NewWriter(&tsdata) + compressor = pgzip.NewWriter(&tsdata) } metadata := storage.NewJSONPacker(compressor) uncompressed, err := archive.DecompressStream(defragmented)