From f86d8682749dda2d0f6dc62d493389a5e0c8d88d Mon Sep 17 00:00:00 2001 From: Ophestra Date: Tue, 25 Mar 2025 19:42:20 +0900 Subject: sandbox: wrap error with its own text message PathError has a pretty good text message, many of them are wrapped with its own text message. This change adds a function to do just that to improve readability. Signed-off-by: Ophestra --- sandbox/mount.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sandbox/mount.go') diff --git a/sandbox/mount.go b/sandbox/mount.go index abad54c1..e22fad7f 100644 --- a/sandbox/mount.go +++ b/sandbox/mount.go @@ -25,7 +25,7 @@ func (p *procPaths) bindMount(source, target string, flags uintptr, eq bool) err var targetFinal string if v, err := filepath.EvalSymlinks(target); err != nil { - return msg.WrapErr(err, err.Error()) + return wrapErrSelf(err) } else { targetFinal = v if targetFinal != target { @@ -45,7 +45,7 @@ func (p *procPaths) bindMount(source, target string, flags uintptr, eq bool) err fmt.Sprintf("cannot open %q:", targetFinal)) } if v, err := os.Readlink(p.fd(destFd)); err != nil { - return msg.WrapErr(err, err.Error()) + return wrapErrSelf(err) } else if err = syscall.Close(destFd); err != nil { return wrapErrSuffix(err, fmt.Sprintf("cannot close %q:", targetFinal)) @@ -102,7 +102,7 @@ func remountWithFlags(n *vfs.MountInfoNode, mf uintptr) error { func mountTmpfs(fsname, name string, size int, perm os.FileMode) error { target := toSysroot(name) if err := os.MkdirAll(target, parentPerm(perm)); err != nil { - return msg.WrapErr(err, err.Error()) + return wrapErrSelf(err) } opt := fmt.Sprintf("mode=%#o", perm) if size > 0 { -- cgit v1.3.1