External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-18 10:35:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Erik Skultety 2016-08-09 16:11:26 +02:00
parent 300f668c66
commit 4914494eb8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/virt-admin.c
View File

@ -351,7 +351,7 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd)
} }
vshAdmReconnect(ctl); vshAdmReconnect(ctl);
if (!connected) if (!connected && priv->conn)
vshPrint(ctl, "%s\n", _("Connected to the admin server")); vshPrint(ctl, "%s\n", _("Connected to the admin server"));
return !!priv->conn; return !!priv->conn;