summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2015-04-06 11:00:20 -0500
committerDan Williams <dcbw@redhat.com>2015-08-07 12:40:58 -0500
commit802a948427fc7a3f7a7626dd153e1704e218d43c (patch)
tree43ecde6e30bc49459b4227075ecd7f51b2a29df9
parent8000561bf9c9254ada515bc8dc173e5146c2b201 (diff)
downloadNetworkManager-802a948427fc7a3f7a7626dd153e1704e218d43c.tar.gz
supplicant: ignore NotConnected errors when disconnecting
-rw-r--r--src/supplicant-manager/nm-supplicant-interface.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c
index f92bd3bd9c..9e33c19d93 100644
--- a/src/supplicant-manager/nm-supplicant-interface.c
+++ b/src/supplicant-manager/nm-supplicant-interface.c
@@ -882,8 +882,10 @@ log_result_cb (GDBusProxy *proxy, GAsyncResult *result, gpointer user_data)
gs_free_error GError *error = NULL;
reply = g_dbus_proxy_call_finish (proxy, result, &error);
- if (!reply && !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
- nm_log_warn (LOGD_SUPPLICANT, "Failed to %s: %s.", error->message, (char *) user_data);
+ if ( !reply
+ && !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)
+ && !strstr (error->message, "fi.w1.wpa_supplicant1.NotConnected"))
+ nm_log_warn (LOGD_SUPPLICANT, "Failed to %s: %s.", (char *) user_data, error->message);
}
void