alexvanin/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

fs: unexport isListxattrPermissionError

Browse source
This commit is contained in:
Michael Eischer 2024-07-21 15:03:17 +02:00
parent 80ed863aab
commit 263709da8c
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/fs/node_aix.go
View file

@ -35,8 +35,8 @@ func nodeFillExtendedAttributes(_ *restic.Node, _ string, _ bool) error {
return nil return nil
} }
// IsListxattrPermissionError is a no-op on AIX. // isListxattrPermissionError is a no-op on AIX.
func IsListxattrPermissionError(_ error) bool { func isListxattrPermissionError(_ error) bool {
return false return false
} }

4
internal/fs/node_netbsd.go
View file

@ -25,8 +25,8 @@ func nodeFillExtendedAttributes(_ *restic.Node, _ string, _ bool) error {
return nil return nil
} }
// IsListxattrPermissionError is a no-op on netbsd. // isListxattrPermissionError is a no-op on netbsd.
func IsListxattrPermissionError(_ error) bool { func isListxattrPermissionError(_ error) bool {
return false return false
} }

4
internal/fs/node_openbsd.go
View file

@ -25,8 +25,8 @@ func nodeFillExtendedAttributes(_ *restic.Node, _ string, _ bool) error {
return nil return nil
} }
// IsListxattrPermissionError is a no-op on openbsd. // isListxattrPermissionError is a no-op on openbsd.
func IsListxattrPermissionError(_ error) bool { func isListxattrPermissionError(_ error) bool {
return false return false
} }

4
internal/fs/node_xattr.go
View file

@ -28,7 +28,7 @@ func listxattr(path string) ([]string, error) {
return l, handleXattrErr(err) return l, handleXattrErr(err)
} }
func IsListxattrPermissionError(err error) bool { func isListxattrPermissionError(err error) bool {
var xerr *xattr.Error var xerr *xattr.Error
if errors.As(err, &xerr) { if errors.As(err, &xerr) {
return xerr.Op == "xattr.list" && errors.Is(xerr.Err, os.ErrPermission) return xerr.Op == "xattr.list" && errors.Is(xerr.Err, os.ErrPermission)
@ -106,7 +106,7 @@ func nodeFillExtendedAttributes(node *restic.Node, path string, ignoreListError
xattrs, err := listxattr(path) xattrs, err := listxattr(path)
debug.Log("fillExtendedAttributes(%v) %v %v", path, xattrs, err) debug.Log("fillExtendedAttributes(%v) %v %v", path, xattrs, err)
if err != nil { if err != nil {
if ignoreListError && IsListxattrPermissionError(err) { if ignoreListError && isListxattrPermissionError(err) {
return nil return nil
} }
return err return err

4
internal/fs/node_xattr_test.go
View file

@ -19,10 +19,10 @@ func TestIsListxattrPermissionError(t *testing.T) {
} }
err := handleXattrErr(xerr) err := handleXattrErr(xerr)
rtest.Assert(t, err != nil, "missing error") rtest.Assert(t, err != nil, "missing error")
rtest.Assert(t, IsListxattrPermissionError(err), "expected IsListxattrPermissionError to return true for %v", err) rtest.Assert(t, isListxattrPermissionError(err), "expected IsListxattrPermissionError to return true for %v", err)
xerr.Err = os.ErrNotExist xerr.Err = os.ErrNotExist
err = handleXattrErr(xerr) err = handleXattrErr(xerr)
rtest.Assert(t, err != nil, "missing error") rtest.Assert(t, err != nil, "missing error")
rtest.Assert(t, !IsListxattrPermissionError(err), "expected IsListxattrPermissionError to return false for %v", err) rtest.Assert(t, !isListxattrPermissionError(err), "expected IsListxattrPermissionError to return false for %v", err)
} }