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

add missing error check

This commit is contained in:
Victor Vieux 2013-10-03 22:33:00 +00:00
parent 1328be7c29
commit f84dc1e908
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
utils.go
View File

@ -83,7 +83,10 @@ func MergeConfig(userConf, imageConf *Config) error {
} else { } else {
for _, imagePortSpec := range imageConf.PortSpecs { for _, imagePortSpec := range imageConf.PortSpecs {
found := false found := false
imageNat, _ := parseNat(imagePortSpec) imageNat, err := parseNat(imagePortSpec)
if err != nil {
return err
}
for _, userPortSpec := range userConf.PortSpecs { for _, userPortSpec := range userConf.PortSpecs {
userNat, err := parseNat(userPortSpec) userNat, err := parseNat(userPortSpec)
if err != nil { if err != nil {