diff options
author | dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> | 2020-09-04 08:16:34 +0000 |
---|---|---|
committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-09-05 06:37:36 -0400 |
commit | b62fa769f8f5ccc982a2566b4c4af0b7096298f3 (patch) | |
tree | 848e9d60ea655c601886b2e0ff3d7889cec8372c /vendor/github.com/klauspost | |
parent | fa487a65220951e84779f200f48780666b4b9209 (diff) | |
download | podman-b62fa769f8f5ccc982a2566b4c4af0b7096298f3.tar.gz podman-b62fa769f8f5ccc982a2566b4c4af0b7096298f3.tar.bz2 podman-b62fa769f8f5ccc982a2566b4c4af0b7096298f3.zip |
Bump github.com/containers/storage from 1.23.2 to 1.23.4
Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.23.2 to 1.23.4.
- [Release notes](https://github.com/containers/storage/releases)
- [Changelog](https://github.com/containers/storage/blob/master/docs/containers-storage-changes.md)
- [Commits](https://github.com/containers/storage/compare/v1.23.2...v1.23.4)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'vendor/github.com/klauspost')
-rw-r--r-- | vendor/github.com/klauspost/pgzip/.travis.yml | 17 | ||||
-rw-r--r-- | vendor/github.com/klauspost/pgzip/gunzip.go | 11 |
2 files changed, 21 insertions, 7 deletions
diff --git a/vendor/github.com/klauspost/pgzip/.travis.yml b/vendor/github.com/klauspost/pgzip/.travis.yml index 6e9fca0ba..acfec4bb0 100644 --- a/vendor/github.com/klauspost/pgzip/.travis.yml +++ b/vendor/github.com/klauspost/pgzip/.travis.yml @@ -1,19 +1,22 @@ language: go -sudo: false - os: - linux - osx go: - - 1.9.x - - 1.10.x + - 1.13.x + - 1.14.x + - 1.15.x - master -script: - - go test -v -cpu=1,2,4 . - - go test -v -cpu=2 -race -short . +env: + - GO111MODULE=off + +script: + - diff <(gofmt -d .) <(printf "") + - go test -v -cpu=1,2,4 . + - go test -v -cpu=2 -race -short . matrix: allow_failures: diff --git a/vendor/github.com/klauspost/pgzip/gunzip.go b/vendor/github.com/klauspost/pgzip/gunzip.go index 93efec714..d1ae730b2 100644 --- a/vendor/github.com/klauspost/pgzip/gunzip.go +++ b/vendor/github.com/klauspost/pgzip/gunzip.go @@ -331,6 +331,16 @@ func (z *Reader) killReadAhead() error { // Wait for decompressor to be closed and return error, if any. e, ok := <-z.closeErr z.activeRA = false + + for blk := range z.readAhead { + if blk.b != nil { + z.blockPool <- blk.b + } + } + if cap(z.current) > 0 { + z.blockPool <- z.current + z.current = nil + } if !ok { // Channel is closed, so if there was any error it has already been returned. return nil @@ -418,6 +428,7 @@ func (z *Reader) doReadAhead() { case z.readAhead <- read{b: buf, err: err}: case <-closeReader: // Sent on close, we don't care about the next results + z.blockPool <- buf return } if err != nil { |