container: wrap container init start errors
All checks were successful
Test / Create distribution (push) Successful in 35s
Test / Sandbox (push) Successful in 1m59s
Test / Hakurei (push) Successful in 3m20s
Test / Sandbox (race detector) (push) Successful in 4m26s
Test / Hpkg (push) Successful in 3m47s
Test / Hakurei (race detector) (push) Successful in 5m21s
Test / Flake checks (push) Successful in 1m35s
All checks were successful
Test / Create distribution (push) Successful in 35s
Test / Sandbox (push) Successful in 1m59s
Test / Hakurei (push) Successful in 3m20s
Test / Sandbox (race detector) (push) Successful in 4m26s
Test / Hpkg (push) Successful in 3m47s
Test / Hakurei (race detector) (push) Successful in 5m21s
Test / Flake checks (push) Successful in 1m35s
This helps indicate the exact origin and nature of the error. This eliminates generic WrapErr from container. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -33,14 +33,16 @@ func (e *OpError) Error() string {
|
||||
}
|
||||
|
||||
switch {
|
||||
case errors.As(e.Err, new(*os.PathError)), errors.As(e.Err, new(*net.OpError)):
|
||||
case errors.As(e.Err, new(*os.PathError)),
|
||||
errors.As(e.Err, new(*net.OpError)),
|
||||
errors.As(e.Err, new(*container.StartError)):
|
||||
return e.Err.Error()
|
||||
|
||||
default:
|
||||
if !e.Revert {
|
||||
return "cannot apply " + e.Op + ": " + e.Err.Error()
|
||||
return "apply " + e.Op + ": " + e.Err.Error()
|
||||
} else {
|
||||
return "cannot revert " + e.Op + ": " + e.Err.Error()
|
||||
return "revert " + e.Op + ": " + e.Err.Error()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,11 +26,11 @@ func TestOpError(t *testing.T) {
|
||||
ErrDBusConfig, syscall.ENOTRECOVERABLE},
|
||||
|
||||
{"apply", newOpError("tmpfile", syscall.EBADE, false),
|
||||
"cannot apply tmpfile: invalid exchange",
|
||||
"apply tmpfile: invalid exchange",
|
||||
syscall.EBADE, syscall.EBADF},
|
||||
|
||||
{"revert", newOpError("wayland", syscall.EBADF, true),
|
||||
"cannot revert wayland: bad file descriptor",
|
||||
"revert wayland: bad file descriptor",
|
||||
syscall.EBADF, syscall.EBADE},
|
||||
|
||||
{"path", newOpError("tmpfile", &os.PathError{Op: "stat", Path: "/run/dbus", Err: syscall.EISDIR}, false),
|
||||
|
||||
Reference in New Issue
Block a user