diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-04-16 16:38:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-16 16:38:38 -0400 |
| commit | b9730d2e9b8cb7d7798929690fa020f180f2e1b2 (patch) | |
| tree | cbc1bebde8b80c8da472865fbe4a85a0146e59bf /pkg/errorhandling/errorhandling.go | |
| parent | bd94d84fadda7000da78e36d9865949dc8e7adb4 (diff) | |
| parent | 9148568b2610c6d1fa03d90acf1f77f7bcea6ba4 (diff) | |
| download | podman-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 'pkg/errorhandling/errorhandling.go')
| -rw-r--r-- | pkg/errorhandling/errorhandling.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/errorhandling/errorhandling.go b/pkg/errorhandling/errorhandling.go index b1923be98..9dc545ebb 100644 --- a/pkg/errorhandling/errorhandling.go +++ b/pkg/errorhandling/errorhandling.go @@ -24,6 +24,9 @@ func JoinErrors(errs []error) error { if finalErr == nil { return finalErr } + if len(multiE.WrappedErrors()) == 1 && logrus.IsLevelEnabled(logrus.TraceLevel) { + return multiE.WrappedErrors()[0] + } return errors.New(strings.TrimSpace(finalErr.Error())) } |