lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util: Port all multierr code to new errwrap package

Browse Source 
This cleans things up and simplifies a lot of the code. Also it's easier
to just import one error package when needed.
This commit is contained in:
James Shubin
2019-03-12 16:51:37 -04:00
parent 880652f5d4
commit 753d1104ef
21 changed files with 83 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lang/types/type.go
View File

@@ -22,7 +22,7 @@ import (
"reflect"
"strings"
multierr "github.com/hashicorp/go-multierror"
"github.com/purpleidea/mgmt/util/errwrap"
)
// Basic types defined here as a convenience for use with Type.Cmp(X).
@@ -597,7 +597,7 @@ func (obj *Type) Cmp(typ *Type) error {
kerr := obj.Key.Cmp(typ.Key)
verr := obj.Val.Cmp(typ.Val)
if kerr != nil && verr != nil {
return multierr.Append(kerr, verr) // two errors
return errwrap.Append(kerr, verr) // two errors
}
if kerr != nil {
return kerr
@@ -964,7 +964,7 @@ func (obj *Type) ComplexCmp(typ *Type) (string, error) {
kstatus, kerr := obj.Key.ComplexCmp(typ.Key)
vstatus, verr := obj.Val.ComplexCmp(typ.Val)
if kerr != nil && verr != nil {
return "", multierr.Append(kerr, verr) // two errors
return "", errwrap.Append(kerr, verr) // two errors
}
if kerr != nil {
return "", kerr