[lxc-devel] [lxc/master] fix wrong order of bridge/nic in error message

[idatahu on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 375 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20191120/34f723de/attachment.bin>
-------------- next part --------------
From 53796b941e1c507eaef2fc8ed977cd618a04ce11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20P=C3=B3ka?= <poka at idata.hu>
Date: Wed, 20 Nov 2019 20:57:28 +0100
Subject: [PATCH] fix wrong order of bridge/nic in error message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Balázs Póka <poka at idata.hu>
---
 src/lxc/network.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lxc/network.c b/src/lxc/network.c
index 65727f6b5a..31282e4aa1 100644
--- a/src/lxc/network.c
+++ b/src/lxc/network.c
@@ -2466,7 +2466,7 @@ int lxc_ovs_delete_port(const char *bridge, const char *nic)
 			  lxc_ovs_delete_port_exec, (void *)&args);
 	if (ret < 0) {
 		ERROR("Failed to delete \"%s\" from openvswitch bridge \"%s\": "
-		      "%s", bridge, nic, cmd_output);
+		      "%s", nic, bridge, cmd_output);
 		return -1;
 	}
 
@@ -2494,7 +2494,7 @@ static int lxc_ovs_attach_bridge(const char *bridge, const char *nic)
 			  lxc_ovs_attach_bridge_exec, (void *)&args);
 	if (ret < 0) {
 		ERROR("Failed to attach \"%s\" to openvswitch bridge \"%s\": %s",
-		      bridge, nic, cmd_output);
+		      nic, bridge, cmd_output);
 		return -1;
 	}