Skip to content

Commit 7770bf6

Browse files
committed
Fix error message on bridge network creation conflict.
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>
1 parent 73e3ce6 commit 7770bf6

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/bridge/bridge.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ func (d *driver) createNetwork(config *networkConfiguration) error {
581581
nw.Unlock()
582582
if err := nwConfig.Conflicts(config); err != nil {
583583
return types.ForbiddenErrorf("cannot create network %s (%s): conflicts with network %s (%s): %s",
584-
nwConfig.BridgeName, config.ID, nw.id, nw.config.BridgeName, err.Error())
584+
config.ID, config.BridgeName, nwConfig.ID, nwConfig.BridgeName, err.Error())
585585
}
586586
}
587587

0 commit comments

Comments
 (0)