aboutsummaryrefslogtreecommitdiff
path: root/cmd/podman/root.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-04-16 16:38:38 -0400
committerGitHub <noreply@github.com>2021-04-16 16:38:38 -0400
commitb9730d2e9b8cb7d7798929690fa020f180f2e1b2 (patch)
treecbc1bebde8b80c8da472865fbe4a85a0146e59bf /cmd/podman/root.go
parentbd94d84fadda7000da78e36d9865949dc8e7adb4 (diff)
parent9148568b2610c6d1fa03d90acf1f77f7bcea6ba4 (diff)
downloadpodman-b9730d2e9b8cb7d7798929690fa020f180f2e1b2.tar.gz
podman-b9730d2e9b8cb7d7798929690fa020f180f2e1b2.tar.bz2
podman-b9730d2e9b8cb7d7798929690fa020f180f2e1b2.zip
Merge pull request #10062 from mheon/bump_311
Bump to v3.1.1
Diffstat (limited to 'cmd/podman/root.go')
-rw-r--r--cmd/podman/root.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/cmd/podman/root.go b/cmd/podman/root.go
index 7722e35dd..4ecad691e 100644
--- a/cmd/podman/root.go
+++ b/cmd/podman/root.go
@@ -408,7 +408,11 @@ func formatError(err error) string {
strings.TrimSuffix(err.Error(), ": "+define.ErrOCIRuntime.Error()),
)
} else {
- message = "Error: " + err.Error()
+ if logrus.IsLevelEnabled(logrus.TraceLevel) {
+ message = fmt.Sprintf("Error: %+v", err)
+ } else {
+ message = fmt.Sprintf("Error: %v", err)
+ }
}
return message
}