pkg/errorhandling.JoinErrors: don't throw away context for lone errors

When our multierror contains just one error, don't extract its text only
to rewrap it, because doing so discards any stack trace information that
might have been added closer to where the error actually originated.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>

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()))
 }