diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-28 15:55:26 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-28 15:55:26 -0800 |
| commit | b2ae45cda18a9615c4ce61425531ce2c911701dc (patch) | |
| tree | 3f0d5561f1df9b2d71254c91c058d35cd59eaef0 | |
| parent | 50eaf6de92b4e9feef9adba41e2b14f3cf3a0809 (diff) | |
| parent | dce5b6176cfbc57d3da31ef817ad9153a31d64d0 (diff) | |
| download | podman-b2ae45cda18a9615c4ce61425531ce2c911701dc.tar.gz podman-b2ae45cda18a9615c4ce61425531ce2c911701dc.tar.bz2 podman-b2ae45cda18a9615c4ce61425531ce2c911701dc.zip | |
Merge pull request #5008 from baude/badconf
display file name of bad cni conf
| -rw-r--r-- | pkg/network/files.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/network/files.go b/pkg/network/files.go index 92cadcf0c..116189c43 100644 --- a/pkg/network/files.go +++ b/pkg/network/files.go @@ -24,7 +24,7 @@ func LoadCNIConfsFromDir(dir string) ([]*libcni.NetworkConfigList, error) { for _, confFile := range files { conf, err := libcni.ConfListFromFile(confFile) if err != nil { - return nil, err + return nil, errors.Wrapf(err, "in %s", confFile) } configs = append(configs, conf) } @@ -41,7 +41,7 @@ func GetCNIConfigPathByName(name string) (string, error) { for _, confFile := range files { conf, err := libcni.ConfListFromFile(confFile) if err != nil { - return "", err + return "", errors.Wrapf(err, "in %s", confFile) } if conf.Name == name { return confFile, nil |