containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5008 from baude/badconf 

display file name of bad cni conf
This commit is contained in:
OpenShift Merge Robot 2020-01-28 15:55:26 -08:00 committed by GitHub
parent 50eaf6de92 dce5b6176c
commit b2ae45cda1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/network/files.go
View File

@ -24,7 +24,7 @@ func LoadCNIConfsFromDir(dir string) ([]*libcni.NetworkConfigList, error) {
for _, confFile := range files { for _, confFile := range files {
conf, err := libcni.ConfListFromFile(confFile) conf, err := libcni.ConfListFromFile(confFile)
if err != nil { if err != nil {
return nil, err return nil, errors.Wrapf(err, "in %s", confFile)
} }
configs = append(configs, conf) configs = append(configs, conf)
} }
@ -41,7 +41,7 @@ func GetCNIConfigPathByName(name string) (string, error) {
for _, confFile := range files { for _, confFile := range files {
conf, err := libcni.ConfListFromFile(confFile) conf, err := libcni.ConfListFromFile(confFile)
if err != nil { if err != nil {
return "", err return "", errors.Wrapf(err, "in %s", confFile)
} }
if conf.Name == name { if conf.Name == name {
return confFile, nil return confFile, nil