summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2021-05-21 16:02:13 -0400
committerMatthew Heon <mheon@redhat.com>2021-05-25 15:27:04 -0400
commit5eecc2761b4439d8b8f41da38e7669415354d63f (patch)
treed7a139ce701cb6772847edc58eef2941b6aa5162
parentba884865c58d83d7a020bfb7fe90a182ebbe1405 (diff)
downloadpodman-5eecc2761b4439d8b8f41da38e7669415354d63f.tar.gz
podman-5eecc2761b4439d8b8f41da38e7669415354d63f.tar.bz2
podman-5eecc2761b4439d8b8f41da38e7669415354d63f.zip
Improve OCI Runtime error
ErrOCIRuntimeNotFound error is misleading. Try to make it more understandable to the user that the OCI Runtime IE crun or runc is not missing, but the command they attempted to run within the container is missing. [NO TESTS NEEDED] Regular tests should handle this. Fixes: https://github.com/containers/podman/issues/10432 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
-rw-r--r--libpod/define/errors.go2
-rw-r--r--test/system/030-run.bats2
2 files changed, 2 insertions, 2 deletions
diff --git a/libpod/define/errors.go b/libpod/define/errors.go
index 81bf5f69c..9fd210eed 100644
--- a/libpod/define/errors.go
+++ b/libpod/define/errors.go
@@ -152,7 +152,7 @@ var (
// ErrOCIRuntimeNotFound indicates the OCI runtime attempted to invoke a command
// that was not found
- ErrOCIRuntimeNotFound = errors.New("OCI not found")
+ ErrOCIRuntimeNotFound = errors.New("OCI runtime attempted to invoke a command that was not found")
// ErrOCIRuntimeUnavailable indicates that the OCI runtime associated to a container
// could not be found in the configuration
diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index 9a136ff13..ccae703e5 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -14,7 +14,7 @@ load helpers
# ...but check the configured runtime engine, and switch to crun as needed
run_podman info --format '{{ .Host.OCIRuntime.Path }}'
if expr "$output" : ".*/crun"; then
- err_no_such_cmd="Error: executable file.* not found in \$PATH: No such file or directory: OCI not found"
+ err_no_such_cmd="Error: executable file.* not found in \$PATH: No such file or directory: OCI runtime attempted to invoke a command that was not found"
err_no_exec_dir="Error: open executable: Operation not permitted: OCI permission denied"
fi