kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Fix error message on bridge network creation conflict.

Browse source 
We now report the correct bridge name and network id when
reporting a conflict.

This fixes #914

Signed-off-by: Ryan Campbell <campbellr@gmail.com>
This commit is contained in:
Ryan Campbell 2016-02-18 09:34:07 -07:00
parent 22cfa44e9a
commit 1417b4ba1d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libnetwork/drivers/bridge/bridge.go
View file

@ -581,7 +581,7 @@ func (d *driver) createNetwork(config *networkConfiguration) error {
nw.Unlock() nw.Unlock()
if err := nwConfig.Conflicts(config); err != nil { if err := nwConfig.Conflicts(config); err != nil {
return types.ForbiddenErrorf("cannot create network %s (%s): conflicts with network %s (%s): %s", return types.ForbiddenErrorf("cannot create network %s (%s): conflicts with network %s (%s): %s",
nwConfig.BridgeName, config.ID, nw.id, nw.config.BridgeName, err.Error()) config.ID, config.BridgeName, nwConfig.ID, nwConfig.BridgeName, err.Error())
} }
} }