fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-26 07:50:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: don't wait for connection change on update failure

Browse source 
When saving a connection, we wait the connection-changed signal before
proceeding to ensure that the remote connection is up to date.
However, no signal is emitted if the update fails and so we shouldn't
wait for it.

Fixes: a370faeb59 ('cli: wait for changed signal after updating a connection'):

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/124
https://bugzilla.redhat.com/show_bug.cgi?id=1702203
(cherry picked from commit 2d347e7e17)
(cherry picked from commit 3423629ff0)
This commit is contained in:
Beniamino Galvani 2019-04-23 22:24:36 +02:00
parent 61b4f31d72
commit 2666aa0bf1
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clients/cli/connections.c
View file

@ -7861,8 +7861,10 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
while (!nmc_editor_cb_called && !timeout)
g_main_context_iteration (NULL, TRUE);
while (!connection_changed && !timeout)
g_main_context_iteration (NULL, TRUE);
if (!nmc_editor_error) {
while (!connection_changed && !timeout)
g_main_context_iteration (NULL, TRUE);
}
if (handler_id)
g_signal_handler_disconnect (rem_con, handler_id);