fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-31 03:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/ovs: don't fail with "cancelled" reason for disconnected ovsdb

Browse source 
API should fail with a "cancelled" error if (and only if)
the user cancelled the operation. An error to communicate
with OVSDB or being disconnected should fail with a different
reason.
This commit is contained in:
Thomas Haller 2020-11-13 13:14:33 +01:00
parent 2983febf39
commit 8b4d77a453
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/devices/ovs/nm-ovsdb.c
View file

@ -2035,7 +2035,10 @@ ovsdb_disconnect(NMOvsdb *self, gboolean retry, gboolean is_disposing)
} else {
gs_free_error GError *error = NULL;
nm_utils_error_set_cancelled(&error, is_disposing, "NMOvsdb");
if (is_disposing)
nm_utils_error_set_cancelled(&error, is_disposing, "NMOvsdb");
else
nm_utils_error_set(&error, NM_UTILS_ERROR_NOT_READY, "disconnected from ovsdb");
while ((call = c_list_last_entry(&priv->calls_lst_head, OvsdbMethodCall, calls_lst)))
_call_complete(call, NULL, error);
}