diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-30 15:54:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-30 15:54:36 +0200 |
| commit | cc22b94a7ab13c546e4b0c42024c13fe9d280b39 (patch) | |
| tree | fc1166cfc6d0efb6a3cf493bf563b032d7f39764 /vendor/github.com/ulikunitz/xz/reader.go | |
| parent | 819375128741f0348b8e4ffd33a96c666e82ee4f (diff) | |
| parent | 366001fb5fa96b3b0f2f9e84b7ebc56dc4c94adc (diff) | |
| download | podman-cc22b94a7ab13c546e4b0c42024c13fe9d280b39.tar.gz podman-cc22b94a7ab13c546e4b0c42024c13fe9d280b39.tar.bz2 podman-cc22b94a7ab13c546e4b0c42024c13fe9d280b39.zip | |
Merge pull request #5602 from rhatdan/vendor
Update vendor of boltdb and containers/image
Diffstat (limited to 'vendor/github.com/ulikunitz/xz/reader.go')
| -rw-r--r-- | vendor/github.com/ulikunitz/xz/reader.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vendor/github.com/ulikunitz/xz/reader.go b/vendor/github.com/ulikunitz/xz/reader.go index 0634c6bcc..22cd6d500 100644 --- a/vendor/github.com/ulikunitz/xz/reader.go +++ b/vendor/github.com/ulikunitz/xz/reader.go @@ -1,4 +1,4 @@ -// Copyright 2014-2017 Ulrich Kunitz. All rights reserved. +// Copyright 2014-2019 Ulrich Kunitz. All rights reserved. // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. @@ -283,7 +283,11 @@ func (c *ReaderConfig) newBlockReader(xz io.Reader, h *blockHeader, if err != nil { return nil, err } - br.r = io.TeeReader(fr, br.hash) + if br.hash.Size() != 0 { + br.r = io.TeeReader(fr, br.hash) + } else { + br.r = fr + } return br, nil } |