[libvirt] [PATCH] virt-admin: Fix the error when an invalid URI has been provided

Erik Skultety eskultet at redhat.com
Tue Aug 9 14:21:39 UTC 2016


After commit 9d479dd1 fiddled with the cmdConnect's output which used to be a
bit more verbose prior to the mentioned commit, the program flow would result
in a quite confusing error if an invalid URI has been provided:

    error: Failed to connect to the admin server
    Connected to the admin server
    error: <some error>

The problem is that the commit mentioned above relied on the fact that
connect routine always succeeds which is not true.

Signed-off-by: Erik Skultety <eskultet at redhat.com>
---
 tools/virt-admin.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/virt-admin.c b/tools/virt-admin.c
index 2ae05da..513054b 100644
--- a/tools/virt-admin.c
+++ b/tools/virt-admin.c
@@ -351,7 +351,7 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd)
     }
 
     vshAdmReconnect(ctl);
-    if (!connected)
+    if (!connected && priv->conn)
         vshPrint(ctl, "%s\n", _("Connected to the admin server"));
 
     return !!priv->conn;
-- 
2.5.5




More information about the libvir-list mailing list