summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-08-28 08:30:01 -0400
committerGitHub <noreply@github.com>2020-08-28 08:30:01 -0400
commite28a187a5300741b924a30a35fbd1367555f482a (patch)
tree0a4ba387040dd82b363b1852e6ed49d4cddf318a
parentad80e9a10a06a5d3b5a8ff6b286232d4c93ee2ea (diff)
parent2ac37f10b4e87dd360b6c6b6a20524a4c414b916 (diff)
downloadpodman-e28a187a5300741b924a30a35fbd1367555f482a.tar.gz
podman-e28a187a5300741b924a30a35fbd1367555f482a.tar.bz2
podman-e28a187a5300741b924a30a35fbd1367555f482a.zip
Merge pull request #7427 from mheon/update_error_messages
Fix up some error messages
-rw-r--r--libpod/oci_conmon_linux.go2
-rw-r--r--pkg/specgen/generate/config_linux.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go
index 82d91c3f6..f66835771 100644
--- a/libpod/oci_conmon_linux.go
+++ b/libpod/oci_conmon_linux.go
@@ -120,7 +120,7 @@ func newConmonOCIRuntime(name string, paths []string, conmonPath string, runtime
if os.IsNotExist(err) {
continue
}
- return nil, errors.Wrapf(err, "cannot stat %s", path)
+ return nil, errors.Wrapf(err, "cannot stat OCI runtime %s path %q", name, path)
}
if !stat.Mode().IsRegular() {
continue
diff --git a/pkg/specgen/generate/config_linux.go b/pkg/specgen/generate/config_linux.go
index 35508c023..1d5dcd8e7 100644
--- a/pkg/specgen/generate/config_linux.go
+++ b/pkg/specgen/generate/config_linux.go
@@ -90,7 +90,7 @@ func DevicesFromPath(g *generate.Generator, devicePath string) error {
}
st, err := os.Stat(resolvedDevicePath)
if err != nil {
- return errors.Wrapf(err, "cannot stat %s", devicePath)
+ return errors.Wrapf(err, "cannot stat device path %s", devicePath)
}
if st.IsDir() {
found := false