From 778f27105773ae48b2ec87126cf811c19f012700 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Wed, 15 Mar 2023 15:15:04 +0100 Subject: [PATCH] syscall: handle errors.ErrUnsupported in isNotSupported Updates #41198 Change-Id: Ifed913f6088b77abc7a21d2a79168a20799f9d0e Reviewed-on: https://go-review.googlesource.com/c/go/+/475857 Run-TryBot: Tobias Klauser Reviewed-by: Ian Lance Taylor TryBot-Result: Gopher Robot Reviewed-by: Bryan Mills Auto-Submit: Tobias Klauser --- src/syscall/exec_linux_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/syscall/exec_linux_test.go b/src/syscall/exec_linux_test.go index 06b9495be2..074a8172d7 100644 --- a/src/syscall/exec_linux_test.go +++ b/src/syscall/exec_linux_test.go @@ -39,6 +39,8 @@ func isNotSupported(err error) bool { switch errno { case syscall.ENOSYS, syscall.ENOTSUP: // Explicitly not supported. + // TODO(#41198): remove these cases when errors.Is reports that they are + // equivalent to ErrUnsupported. return true case syscall.EPERM, syscall.EROFS: // User lacks permission: either the call requires root permission and the @@ -51,12 +53,10 @@ func isNotSupported(err error) bool { } } - if errors.Is(err, fs.ErrPermission) { + if errors.Is(err, fs.ErrPermission) || errors.Is(err, errors.ErrUnsupported) { return true } - // TODO(#41198): Also return true if errors.Is(err, errors.ErrUnsupported). - return false } -- 2.50.0