From: Erik Skultety <eskultet@redhat.com>
Date: Tue, 9 Aug 2016 14:11:26 +0000 (+0200)
Subject: virt-admin: Fix the error when an invalid URI has been provided
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4914494eb8e25ff7938a12fd089c746ec6042bbb;p=libvirt.git

virt-admin: Fix the error when an invalid URI has been provided

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@redhat.com>
---

diff --git a/tools/virt-admin.c b/tools/virt-admin.c
index 2ae05dab72..513054b38b 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;