diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-08-19 05:57:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-19 05:57:02 -0400 |
| commit | 8b848740cf79ab09807025eafb0d05e54ec13cc0 (patch) | |
| tree | 2f8361da4f8f20dee714593ef32b57b1d947532c /pkg | |
| parent | 7a0d94837a15a195f33e82d18a4d8f7d8e65e0f5 (diff) | |
| parent | aeffdb05d1782176ac9aee8482bbf1f96228b3ae (diff) | |
| download | podman-8b848740cf79ab09807025eafb0d05e54ec13cc0.tar.gz podman-8b848740cf79ab09807025eafb0d05e54ec13cc0.tar.bz2 podman-8b848740cf79ab09807025eafb0d05e54ec13cc0.zip | |
Merge pull request #11260 from nalind/remote-build-path
pkg/bindings/images.nTar(): slashify hdr.Name values
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/bindings/images/build.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go index e1aeae244..39e0fc5df 100644 --- a/pkg/bindings/images/build.go +++ b/pkg/bindings/images/build.go @@ -481,9 +481,9 @@ func nTar(excludes []string, sources ...string) (io.ReadCloser, error) { return nil // skip root dir } - name := strings.TrimPrefix(path, s+string(filepath.Separator)) + name := filepath.ToSlash(strings.TrimPrefix(path, s+string(filepath.Separator))) - excluded, err := pm.Matches(filepath.ToSlash(name)) // nolint:staticcheck + excluded, err := pm.Matches(name) // nolint:staticcheck if err != nil { return errors.Wrapf(err, "error checking if %q is excluded", name) } |