From 4e9047dcbdd365b21bc91ac8c1355c25bf01d7e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Nov 2022 13:59:04 +0000 Subject: [PATCH] rebase: bump github.com/pkg/xattr from 0.4.7 to 0.4.9 Bumps [github.com/pkg/xattr](https://github.com/pkg/xattr) from 0.4.7 to 0.4.9. - [Release notes](https://github.com/pkg/xattr/releases) - [Commits](https://github.com/pkg/xattr/compare/v0.4.7...v0.4.9) --- updated-dependencies: - dependency-name: github.com/pkg/xattr dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/pkg/xattr/xattr.go | 2 ++ vendor/github.com/pkg/xattr/xattr_solaris.go | 2 +- vendor/github.com/pkg/xattr/xattr_unsupported.go | 2 +- vendor/modules.txt | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 3d9980289..6e4d9c603 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/libopenstorage/secrets v0.0.0-20210908194121-a1d19aa9713a github.com/onsi/ginkgo/v2 v2.4.0 github.com/onsi/gomega v1.23.0 - github.com/pkg/xattr v0.4.7 + github.com/pkg/xattr v0.4.9 github.com/prometheus/client_golang v1.12.2 github.com/stretchr/testify v1.8.1 golang.org/x/crypto v0.1.0 diff --git a/go.sum b/go.sum index 57c4a1281..590a147f9 100644 --- a/go.sum +++ b/go.sum @@ -897,8 +897,8 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= -github.com/pkg/xattr v0.4.7 h1:XoA3KzmFvyPlH4RwX5eMcgtzcaGBaSvgt3IoFQfbrmQ= -github.com/pkg/xattr v0.4.7/go.mod h1:di8WF84zAKk8jzR1UBTEWh9AUlIZZ7M/JNt8e9B6ktU= +github.com/pkg/xattr v0.4.9 h1:5883YPCtkSd8LFbs13nXplj9g9tlrwoJRjgpgMu1/fE= +github.com/pkg/xattr v0.4.9/go.mod h1:di8WF84zAKk8jzR1UBTEWh9AUlIZZ7M/JNt8e9B6ktU= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/portworx/dcos-secrets v0.0.0-20180616013705-8e8ec3f66611/go.mod h1:4hklRW/4DQpLqkcXcjtNprbH2tz/sJaNtqinfPWl/LA= diff --git a/vendor/github.com/pkg/xattr/xattr.go b/vendor/github.com/pkg/xattr/xattr.go index f982da304..8b2b5fe80 100644 --- a/vendor/github.com/pkg/xattr/xattr.go +++ b/vendor/github.com/pkg/xattr/xattr.go @@ -29,6 +29,8 @@ type Error struct { Err error } +func (e *Error) Unwrap() error { return e.Err } + func (e *Error) Error() (errstr string) { if e.Op != "" { errstr += e.Op diff --git a/vendor/github.com/pkg/xattr/xattr_solaris.go b/vendor/github.com/pkg/xattr/xattr_solaris.go index 38d88d609..8d65b8d8d 100644 --- a/vendor/github.com/pkg/xattr/xattr_solaris.go +++ b/vendor/github.com/pkg/xattr/xattr_solaris.go @@ -131,7 +131,7 @@ func llistxattr(path string, data []byte) (int, error) { func flistxattr(f *os.File, data []byte) (int, error) { fd, err := unix.Openat(int(f.Fd()), ".", unix.O_RDONLY|unix.O_XATTR, 0) if err != nil { - return 0, err + return 0, unix.ENOTSUP } xf := os.NewFile(uintptr(fd), f.Name()) defer func() { diff --git a/vendor/github.com/pkg/xattr/xattr_unsupported.go b/vendor/github.com/pkg/xattr/xattr_unsupported.go index 4153decb1..8886fbdc4 100644 --- a/vendor/github.com/pkg/xattr/xattr_unsupported.go +++ b/vendor/github.com/pkg/xattr/xattr_unsupported.go @@ -10,7 +10,7 @@ import ( const ( // We need to use the default for non supported operating systems - ENOATTR = syscall.ENODATA + ENOATTR = syscall.Errno(0x59) ) // XATTR_SUPPORTED will be true if the current platform is supported diff --git a/vendor/modules.txt b/vendor/modules.txt index 2ea53f428..8d39ef4f5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -481,7 +481,7 @@ github.com/pierrec/lz4/internal/xxh32 # github.com/pkg/errors v0.9.1 ## explicit github.com/pkg/errors -# github.com/pkg/xattr v0.4.7 +# github.com/pkg/xattr v0.4.9 ## explicit; go 1.14 github.com/pkg/xattr # github.com/pmezard/go-difflib v1.0.0