diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-24 16:52:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-24 16:52:02 +0200 |
| commit | 72260a296c534950d9c899ee907e73b5dd0162f0 (patch) | |
| tree | d9b33042a70c2d1e600c75855a29b3aa594aaab6 /vendor/github.com/fsouza/go-dockerclient/internal/archive/archive_linux.go | |
| parent | cf244d87cdb9b2cb0d8510b2ea392d928c1eb269 (diff) | |
| parent | d697456dc90adbaf68224ed7c115b38d5855e582 (diff) | |
| download | podman-72260a296c534950d9c899ee907e73b5dd0162f0.tar.gz podman-72260a296c534950d9c899ee907e73b5dd0162f0.tar.bz2 podman-72260a296c534950d9c899ee907e73b5dd0162f0.zip | |
Merge pull request #3414 from vrothberg/go-modules
Go modules
Diffstat (limited to 'vendor/github.com/fsouza/go-dockerclient/internal/archive/archive_linux.go')
| -rw-r--r-- | vendor/github.com/fsouza/go-dockerclient/internal/archive/archive_linux.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vendor/github.com/fsouza/go-dockerclient/internal/archive/archive_linux.go b/vendor/github.com/fsouza/go-dockerclient/internal/archive/archive_linux.go index 9e1f3f2f1..e2059e489 100644 --- a/vendor/github.com/fsouza/go-dockerclient/internal/archive/archive_linux.go +++ b/vendor/github.com/fsouza/go-dockerclient/internal/archive/archive_linux.go @@ -49,7 +49,9 @@ func (overlayWhiteoutConverter) ConvertWrite(hdr *tar.Header, path string, fi os return nil, err } if len(opaque) == 1 && opaque[0] == 'y' { + //lint:ignore SA1019 this is vendored/copied code if hdr.Xattrs != nil { + //lint:ignore SA1019 this is vendored/copied code delete(hdr.Xattrs, "trusted.overlay.opaque") } |