diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-16 14:24:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-16 14:24:02 -0400 |
| commit | 667dae3b8dc4d474184e9628c9f73c0262d0cb40 (patch) | |
| tree | 73abe93855b0a1f72bb64d195c248888e12ce39d /vendor/github.com/containerd/stargz-snapshotter/estargz/estargz.go | |
| parent | 08fa6c77010c251a95ceb788a5cff2e005727a94 (diff) | |
| parent | d68e9faee20a1032e6a425f3fcc253f948f9c736 (diff) | |
| download | podman-667dae3b8dc4d474184e9628c9f73c0262d0cb40.tar.gz podman-667dae3b8dc4d474184e9628c9f73c0262d0cb40.tar.bz2 podman-667dae3b8dc4d474184e9628c9f73c0262d0cb40.zip | |
Merge pull request #13865 from rhatdan/VENDOR
Update vendor of storage,common
Diffstat (limited to 'vendor/github.com/containerd/stargz-snapshotter/estargz/estargz.go')
| -rw-r--r-- | vendor/github.com/containerd/stargz-snapshotter/estargz/estargz.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vendor/github.com/containerd/stargz-snapshotter/estargz/estargz.go b/vendor/github.com/containerd/stargz-snapshotter/estargz/estargz.go index 4b655c145..921e59ec6 100644 --- a/vendor/github.com/containerd/stargz-snapshotter/estargz/estargz.go +++ b/vendor/github.com/containerd/stargz-snapshotter/estargz/estargz.go @@ -31,7 +31,6 @@ import ( "fmt" "hash" "io" - "io/ioutil" "os" "path" "sort" @@ -579,7 +578,7 @@ func (fr *fileReader) ReadAt(p []byte, off int64) (n int, err error) { return 0, fmt.Errorf("fileReader.ReadAt.decompressor.Reader: %v", err) } defer dr.Close() - if n, err := io.CopyN(ioutil.Discard, dr, off); n != off || err != nil { + if n, err := io.CopyN(io.Discard, dr, off); n != off || err != nil { return 0, fmt.Errorf("discard of %d bytes = %v, %v", off, n, err) } return io.ReadFull(dr, p) @@ -933,7 +932,7 @@ func (w *Writer) appendTar(r io.Reader, lossless bool) error { } } } - remainDest := ioutil.Discard + remainDest := io.Discard if lossless { remainDest = dst // Preserve the remaining bytes in lossless mode } |