diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-04-15 09:08:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-15 09:08:37 -0400 |
| commit | 405331ff9072e6febed123aafdc365517917ab44 (patch) | |
| tree | 0e965ca02fe57c2c0110d17c46dcdbd7ab68aebf /pkg | |
| parent | b2a3bb4a6180b390c87565c49798990384f16976 (diff) | |
| parent | bc86c50cd81bc3267ec8b9840e1a0e705231f336 (diff) | |
| download | podman-405331ff9072e6febed123aafdc365517917ab44.tar.gz podman-405331ff9072e6febed123aafdc365517917ab44.tar.bz2 podman-405331ff9072e6febed123aafdc365517917ab44.zip | |
Merge pull request #10032 from nalind/trace-level
Recognize "trace" logging, and use it for lone errors at exit
Diffstat (limited to 'pkg')
| -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())) } |