From 1417b4ba1d9c009306518162cd3a54e0ff36447f Mon Sep 17 00:00:00 2001 From: Ryan Campbell Date: Thu, 18 Feb 2016 09:34:07 -0700 Subject: [PATCH] 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 --- libnetwork/drivers/bridge/bridge.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnetwork/drivers/bridge/bridge.go b/libnetwork/drivers/bridge/bridge.go index 55acf8ac7f..dd46384cdc 100644 --- a/libnetwork/drivers/bridge/bridge.go +++ b/libnetwork/drivers/bridge/bridge.go @@ -581,7 +581,7 @@ func (d *driver) createNetwork(config *networkConfiguration) error { nw.Unlock() if err := nwConfig.Conflicts(config); err != nil { 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()) } }