You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
39 lines
1.5 KiB
39 lines
1.5 KiB
From ac383b87ffd097b67b0b1cd2818df0e41bb17903 Mon Sep 17 00:00:00 2001 |
|
From: Beniamino Galvani <bgalvani@redhat.com> |
|
Date: Tue, 23 Apr 2019 22:24:36 +0200 |
|
Subject: [PATCH] cli: don't wait for connection change on update failure |
|
|
|
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: a370faeb59a9 ('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 2d347e7e176e7cb8daaa2e02b0758821fc3f5f04) |
|
(cherry picked from commit 3423629ff0fc65c16c2a4c541a5fc3435cd72091) |
|
--- |
|
clients/cli/connections.c | 6 ++++-- |
|
1 file changed, 4 insertions(+), 2 deletions(-) |
|
|
|
diff --git a/clients/cli/connections.c b/clients/cli/connections.c |
|
index 034fc19f5..7bfbe0b6a 100644 |
|
--- a/clients/cli/connections.c |
|
+++ b/clients/cli/connections.c |
|
@@ -7817,8 +7817,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); |
|
-- |
|
2.20.1
|
|
|