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

[Erik Skultety]

On 09/08/16 21:52, Martin Kletzander wrote:
> On Tue, Aug 09, 2016 at 04:21:39PM +0200, Erik Skultety wrote:
>> 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"));
>>
> 
> I can't believe how different the virsh and virt-admin clients are.
> That's what I was worried about.  Anyway, ACK for now, but it'd be nice
> to fix some of the differences.

Thanks, I pushed the patch.

Erik