]> Cypherpunks repositories - gostls13.git/commitdiff
syscall: handle errors.ErrUnsupported in isNotSupported
authorTobias Klauser <tklauser@distanz.ch>
Wed, 15 Mar 2023 14:15:04 +0000 (15:15 +0100)
committerGopher Robot <gobot@golang.org>
Wed, 15 Mar 2023 14:29:43 +0000 (14:29 +0000)
Updates #41198

Change-Id: Ifed913f6088b77abc7a21d2a79168a20799f9d0e
Reviewed-on: https://go-review.googlesource.com/c/go/+/475857
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Bryan Mills <bcmills@google.com>
Auto-Submit: Tobias Klauser <tobias.klauser@gmail.com>

src/syscall/exec_linux_test.go

index 06b9495be20a271cb201c8c0c46b77f581705285..074a8172d7cd1ade2ec1e8ef6ba6e154a5a57483 100644 (file)
@@ -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
 }