From d94b501b7bffd8a2e30ecc2928b679251e8ef80e Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A1n=20Tomko?= Date: Thu, 13 Dec 2012 14:08:00 +0100 Subject: [PATCH] virsh: don't lie about reconnection in vshReconnect Since we (ab)use vshReconnect for the default URI connection, if it fails it might print 'Failed to reconnect to the hypervisor' even if we were never connected before. This changes it to only mention reconnection on the first try after getting disconnected. --- tools/virsh.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/virsh.c b/tools/virsh.c index b4829a34df..9845b1259d 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -331,7 +331,10 @@ vshReconnect(vshControl *ctl) virConnectAuthPtrDefault, ctl->readonly ? VIR_CONNECT_RO : 0); if (!ctl->conn) { - vshError(ctl, "%s", _("Failed to reconnect to the hypervisor")); + if (disconnected) + vshError(ctl, "%s", _("Failed to reconnect to the hypervisor")); + else + vshError(ctl, "%s", _("failed to connect to the hypervisor")); } else { if (virConnectRegisterCloseCallback(ctl->conn, vshCatchDisconnect, NULL, NULL) < 0) -- 2.47.2