Merge pull request #2355 from thaJeztah/wrap_errors

Use errors.Wrap to preserve original error
This commit is contained in:
Madhu Venugopal 2019-04-04 05:36:28 -07:00 committed by GitHub
commit be71a0d834

View file

@ -13,6 +13,7 @@ import (
"github.com/docker/libnetwork/osl"
"github.com/docker/libnetwork/resolvconf"
"github.com/docker/libnetwork/types"
"github.com/pkg/errors"
"github.com/vishvananda/netlink"
)
@ -97,8 +98,7 @@ func ElectInterfaceAddresses(name string) ([]*net.IPNet, []*net.IPNet, error) {
// Choose from predefined local scope networks
v4Net, err := FindAvailableNetwork(ipamutils.PredefinedLocalScopeDefaultNetworks)
if err != nil {
return nil, nil, fmt.Errorf("%s, PredefinedLocalScopeDefaultNetworks List: %+v",
err.Error(),
return nil, nil, errors.Wrapf(err, "PredefinedLocalScopeDefaultNetworks List: %+v",
ipamutils.PredefinedLocalScopeDefaultNetworks)
}
v4Nets = append(v4Nets, v4Net)